2024-06-12 20:54:10 -07:00
|
|
|
<v:ChromelessWindow 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:vm="using:SourceGit.ViewModels"
|
|
|
|
xmlns:v="using:SourceGit.Views"
|
|
|
|
xmlns:c="using:SourceGit.Converters"
|
|
|
|
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
|
|
|
x:Class="SourceGit.Views.BranchCompare"
|
|
|
|
x:DataType="vm:BranchCompare"
|
|
|
|
Icon="/App.ico"
|
|
|
|
Title="{DynamicResource Text.BranchCompare}"
|
|
|
|
MinWidth="1280" MinHeight="720"
|
|
|
|
WindowStartupLocation="CenterOwner">
|
|
|
|
<Grid>
|
2024-06-11 00:30:06 -07:00
|
|
|
<Grid.RowDefinitions>
|
|
|
|
<RowDefinition Height="30"/>
|
|
|
|
<RowDefinition Height="64"/>
|
|
|
|
<RowDefinition Height="*"/>
|
|
|
|
</Grid.RowDefinitions>
|
|
|
|
|
|
|
|
<!-- TitleBar -->
|
|
|
|
<Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,*,Auto">
|
|
|
|
<!-- Bottom border -->
|
|
|
|
<Border Grid.Column="0" Grid.ColumnSpan="4"
|
|
|
|
Background="{DynamicResource Brush.TitleBar}"
|
|
|
|
BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
|
|
|
|
DoubleTapped="MaximizeOrRestoreWindow"
|
2024-06-13 02:55:22 -07:00
|
|
|
PointerPressed="BeginMoveWindow"
|
|
|
|
PointerMoved="MoveWindow"
|
|
|
|
PointerReleased="EndMoveWindow"/>
|
2024-06-11 00:30:06 -07:00
|
|
|
|
|
|
|
<!-- Caption Buttons (macOS) -->
|
|
|
|
<Border Grid.Column="0" IsVisible="{OnPlatform False, macOS=True}">
|
|
|
|
<v:CaptionButtonsMacOS/>
|
|
|
|
</Border>
|
|
|
|
|
|
|
|
<!-- Icon -->
|
|
|
|
<Path Grid.Column="1" Margin="8,0,0,0" Width="12" Height="12" Data="{StaticResource Icons.Compare}"/>
|
|
|
|
|
|
|
|
<!-- Title -->
|
|
|
|
<TextBlock Grid.Column="2" Margin="8,0,0,0" Text="{DynamicResource Text.BranchCompare}" FontWeight="Bold" IsHitTestVisible="False" VerticalAlignment="Center"/>
|
|
|
|
|
|
|
|
<!-- Caption Buttons (Windows/Linux) -->
|
|
|
|
<Border Grid.Column="3" IsVisible="{OnPlatform True, macOS=False}">
|
|
|
|
<v:CaptionButtons/>
|
|
|
|
</Border>
|
|
|
|
</Grid>
|
|
|
|
|
|
|
|
<!-- Compare Targets -->
|
2024-06-12 20:54:10 -07:00
|
|
|
<Border Grid.Row="1">
|
2024-06-11 00:30:06 -07:00
|
|
|
<Grid Margin="48,8,48,8" ColumnDefinitions="*,48,*">
|
|
|
|
<Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
|
|
|
|
<Grid RowDefinitions="Auto,*">
|
|
|
|
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
|
|
|
|
<v:Avatar Width="16" Height="16"
|
|
|
|
VerticalAlignment="Center"
|
|
|
|
IsHitTestVisible="False"
|
|
|
|
User="{Binding BaseHead.Author}"/>
|
2024-07-29 05:48:04 -07:00
|
|
|
<TextBlock Grid.Column="1" Classes="primary" Text="{Binding BaseHead.Author.Name}" Margin="8,0,0,0"/>
|
2024-06-11 00:30:06 -07:00
|
|
|
<Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
|
2024-07-29 05:48:04 -07:00
|
|
|
<TextBlock Text="{Binding Base.FriendlyName}" Classes="primary" Margin="4,0" Foreground="#FFDDDDDD"/>
|
2024-06-11 00:30:06 -07:00
|
|
|
</Border>
|
2024-07-29 05:48:04 -07:00
|
|
|
<TextBlock Grid.Column="3" Classes="primary" Text="{Binding BaseHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" PointerPressed="OnPressedSHA"/>
|
|
|
|
<TextBlock Grid.Column="4" Classes="primary" Text="{Binding BaseHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
|
2024-06-11 00:30:06 -07:00
|
|
|
</Grid>
|
|
|
|
|
2024-07-29 05:48:04 -07:00
|
|
|
<TextBlock Grid.Row="1" Classes="primary" Text="{Binding BaseHead.Subject}" VerticalAlignment="Bottom"/>
|
2024-06-11 00:30:06 -07:00
|
|
|
</Grid>
|
|
|
|
</Border>
|
|
|
|
|
2024-07-23 21:17:44 -07:00
|
|
|
<!-- Swap Button -->
|
|
|
|
<Button Grid.Column="1" Classes="icon_button" Command="{Binding Swap}" HorizontalAlignment="Center" ToolTip.Tip="{DynamicResource Text.Diff.SwapCommits}">
|
|
|
|
<Path Width="16" Height="16" Fill="{DynamicResource Brush.FG2}" Data="{DynamicResource Icons.Compare}"/>
|
|
|
|
</Button>
|
2024-06-11 00:30:06 -07:00
|
|
|
|
|
|
|
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
|
|
|
|
<Grid RowDefinitions="Auto,*">
|
|
|
|
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
|
|
|
|
<v:Avatar Width="16" Height="16"
|
|
|
|
VerticalAlignment="Center"
|
|
|
|
IsHitTestVisible="False"
|
|
|
|
User="{Binding ToHead.Author}"/>
|
2024-07-29 05:48:04 -07:00
|
|
|
<TextBlock Grid.Column="1" Classes="primary" Text="{Binding ToHead.Author.Name}" Margin="8,0,0,0"/>
|
2024-06-11 00:30:06 -07:00
|
|
|
<Border Grid.Column="2" Background="{DynamicResource Brush.Accent}" CornerRadius="4">
|
2024-07-29 05:48:04 -07:00
|
|
|
<TextBlock Text="{Binding To.FriendlyName}" Classes="primary" Margin="4,0" Foreground="#FFDDDDDD"/>
|
2024-06-11 00:30:06 -07:00
|
|
|
</Border>
|
2024-07-29 05:48:04 -07:00
|
|
|
<TextBlock Grid.Column="3" Classes="primary" Text="{Binding ToHead.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0" TextDecorations="Underline" PointerPressed="OnPressedSHA"/>
|
|
|
|
<TextBlock Grid.Column="4" Classes="primary" Text="{Binding ToHead.CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
|
2024-06-11 00:30:06 -07:00
|
|
|
</Grid>
|
|
|
|
|
2024-07-29 05:48:04 -07:00
|
|
|
<TextBlock Grid.Row="1" Classes="primary" Text="{Binding ToHead.Subject}" VerticalAlignment="Bottom"/>
|
2024-06-11 00:30:06 -07:00
|
|
|
</Grid>
|
|
|
|
</Border>
|
|
|
|
</Grid>
|
|
|
|
</Border>
|
|
|
|
|
|
|
|
<!-- Changes -->
|
2024-06-12 20:54:10 -07:00
|
|
|
<Border Grid.Row="2">
|
2024-06-11 00:30:06 -07:00
|
|
|
<Grid Margin="8,0,8,8">
|
|
|
|
<Grid.ColumnDefinitions>
|
|
|
|
<ColumnDefinition Width="256" MinWidth="200" MaxWidth="480"/>
|
|
|
|
<ColumnDefinition Width="4"/>
|
|
|
|
<ColumnDefinition Width="*"/>
|
|
|
|
</Grid.ColumnDefinitions>
|
|
|
|
|
|
|
|
<Grid Grid.Column="0" RowDefinitions="26,*">
|
|
|
|
<!-- Search & Display Mode -->
|
|
|
|
<Grid Grid.Row="0" ColumnDefinitions="*,18">
|
|
|
|
<TextBox Grid.Column="0"
|
|
|
|
Height="26"
|
|
|
|
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
|
|
|
|
Background="Transparent"
|
|
|
|
CornerRadius="4"
|
|
|
|
Watermark="{DynamicResource Text.CommitDetail.Changes.Search}"
|
|
|
|
Text="{Binding SearchFilter, Mode=TwoWay}">
|
|
|
|
<TextBox.InnerLeftContent>
|
|
|
|
<Path Width="14" Height="14" Margin="4,0,0,0" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Search}"/>
|
|
|
|
</TextBox.InnerLeftContent>
|
|
|
|
|
|
|
|
<TextBox.InnerRightContent>
|
|
|
|
<Button Classes="icon_button"
|
|
|
|
IsVisible="{Binding SearchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
|
|
|
|
Command="{Binding ClearSearchFilter}">
|
|
|
|
<Path Width="14" Height="14" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Clear}"/>
|
|
|
|
</Button>
|
|
|
|
</TextBox.InnerRightContent>
|
|
|
|
</TextBox>
|
|
|
|
|
|
|
|
<v:ChangeViewModeSwitcher Grid.Column="1"
|
|
|
|
Width="14" Height="14"
|
|
|
|
HorizontalAlignment="Right"
|
|
|
|
ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=CommitChangeViewMode, Mode=TwoWay}"/>
|
|
|
|
</Grid>
|
|
|
|
|
|
|
|
<!-- Changes -->
|
|
|
|
<Border Grid.Row="1" Margin="0,4,0,0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}">
|
2024-07-17 01:56:16 -07:00
|
|
|
<v:ChangeCollectionView ViewMode="{Binding Source={x:Static vm:Preference.Instance}, Path=CommitChangeViewMode}"
|
2024-06-11 00:30:06 -07:00
|
|
|
Changes="{Binding VisibleChanges}"
|
|
|
|
SelectedChanges="{Binding SelectedChanges, Mode=TwoWay}"
|
|
|
|
ContextRequested="OnChangeContextRequested"/>
|
|
|
|
</Border>
|
|
|
|
</Grid>
|
|
|
|
|
|
|
|
<GridSplitter Grid.Column="1"
|
|
|
|
MinWidth="1"
|
|
|
|
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
|
|
|
|
Background="Transparent"/>
|
|
|
|
|
|
|
|
<Grid Grid.Column="2">
|
|
|
|
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
|
|
|
|
<StackPanel Orientation="Vertical" VerticalAlignment="Center">
|
|
|
|
<Path Width="64" Height="64" Data="{StaticResource Icons.Diff}" Fill="{DynamicResource Brush.FG2}"/>
|
|
|
|
<TextBlock Margin="0,16,0,0"
|
|
|
|
Text="{DynamicResource Text.Diff.Welcome}"
|
|
|
|
FontSize="18" FontWeight="Bold"
|
|
|
|
Foreground="{DynamicResource Brush.FG2}"
|
|
|
|
HorizontalAlignment="Center"/>
|
|
|
|
</StackPanel>
|
|
|
|
</Border>
|
|
|
|
|
|
|
|
<ContentControl Content="{Binding DiffContext}">
|
|
|
|
<ContentControl.DataTemplates>
|
|
|
|
<DataTemplate DataType="vm:DiffContext">
|
|
|
|
<v:DiffView/>
|
|
|
|
</DataTemplate>
|
|
|
|
</ContentControl.DataTemplates>
|
|
|
|
</ContentControl>
|
|
|
|
</Grid>
|
|
|
|
</Grid>
|
|
|
|
</Border>
|
|
|
|
</Grid>
|
2024-06-12 20:54:10 -07:00
|
|
|
</v:ChromelessWindow>
|