code_style: run dotnet format

Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-03-17 20:57:18 +08:00
parent 8d47bd5cd9
commit 695db2a319
No known key found for this signature in database
55 changed files with 307 additions and 308 deletions

View file

@ -29,7 +29,6 @@
Signer = lines[1], Signer = lines[1],
Key = lines[2] Key = lines[2]
}; };
} }
} }
} }

View file

@ -31,7 +31,7 @@ namespace SourceGit.Native
var env = File.ReadAllText(customPathFile).Trim(); var env = File.ReadAllText(customPathFile).Trim();
if (!string.IsNullOrEmpty(env)) if (!string.IsNullOrEmpty(env))
path = env; path = env;
} }
Environment.SetEnvironmentVariable("PATH", path); Environment.SetEnvironmentVariable("PATH", path);
} }

View file

@ -28,7 +28,7 @@
Text="{DynamicResource Text.About}" Text="{DynamicResource Text.About}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
IsHitTestVisible="False"/> IsHitTestVisible="False"/>
<v:CaptionButtons HorizontalAlignment="Right" <v:CaptionButtons HorizontalAlignment="Right"
IsCloseButtonOnly="True" IsCloseButtonOnly="True"
IsVisible="{OnPlatform True, macOS=False}"/> IsVisible="{OnPlatform True, macOS=False}"/>

View file

@ -27,7 +27,7 @@
</Button> </Button>
</TextBox.InnerRightContent> </TextBox.InnerRightContent>
</TextBox> </TextBox>
<TextBlock Grid.Row="1" Grid.Column="0" <TextBlock Grid.Row="1" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0" Margin="0,0,8,0"
@ -67,15 +67,15 @@
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<Border Grid.Row="3" Grid.Column="0" <Border Grid.Row="3" Grid.Column="0"
Height="32" Height="32"
IsVisible="{Binding SetTrackingBranch, Mode=OneWay}"> IsVisible="{Binding SetTrackingBranch, Mode=OneWay}">
<TextBlock HorizontalAlignment="Right" VerticalAlignment="Center" <TextBlock HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0" Margin="0,0,8,0"
Text="{DynamicResource Text.AddWorktree.Tracking}"/> Text="{DynamicResource Text.AddWorktree.Tracking}"/>
</Border> </Border>
<ComboBox Grid.Row="3" Grid.Column="1" <ComboBox Grid.Row="3" Grid.Column="1"
Height="28" Padding="8,0" Height="28" Padding="8,0"
VerticalAlignment="Center" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalAlignment="Stretch"

View file

@ -38,7 +38,7 @@
<Border Margin="16,0"> <Border Margin="16,0">
<TextBlock x:Name="TxtDescription" Text="Enter passphrase:" TextWrapping="Wrap"/> <TextBlock x:Name="TxtDescription" Text="Enter passphrase:" TextWrapping="Wrap"/>
</Border> </Border>
<TextBox x:Name="TxtPassphrase" <TextBox x:Name="TxtPassphrase"
Margin="16" Margin="16"
MinWidth="300" MinWidth="300"
@ -55,7 +55,7 @@
Width="26" Height="14"/> Width="26" Height="14"/>
</TextBox.InnerRightContent> </TextBox.InnerRightContent>
</TextBox> </TextBox>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<Button Classes="flat primary" <Button Classes="flat primary"
Width="80" Width="80"

View file

@ -14,13 +14,13 @@
Width="600" Height="400" Width="600" Height="400"
CanResize="False" CanResize="False"
WindowStartupLocation="CenterOwner"> WindowStartupLocation="CenterOwner">
<Grid RowDefinitions="Auto,*"> <Grid RowDefinitions="Auto,*">
<!-- TitleBar --> <!-- TitleBar -->
<Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}"> <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
<Border Background="{DynamicResource Brush.TitleBar}" <Border Background="{DynamicResource Brush.TitleBar}"
BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
PointerPressed="BeginMoveWindow"/> PointerPressed="BeginMoveWindow"/>
<Path Width="14" Height="14" <Path Width="14" Height="14"
Margin="10,0,0,0" Margin="10,0,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@ -36,7 +36,7 @@
IsCloseButtonOnly="True" IsCloseButtonOnly="True"
IsVisible="{OnPlatform True, macOS=False}"/> IsVisible="{OnPlatform True, macOS=False}"/>
</Grid> </Grid>
<!-- Unchanged Files --> <!-- Unchanged Files -->
<Grid Grid.Row="1"> <Grid Grid.Row="1">
<ListBox Margin="8" <ListBox Margin="8"
@ -60,7 +60,7 @@
<VirtualizingStackPanel Orientation="Vertical"/> <VirtualizingStackPanel Orientation="Vertical"/>
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ListBox.ItemsPanel> </ListBox.ItemsPanel>
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate> <DataTemplate>
<Grid Height="26" ColumnDefinitions="26,*,30"> <Grid Height="26" ColumnDefinitions="26,*,30">
@ -83,6 +83,6 @@
<Path Width="48" Height="48" Data="{StaticResource Icons.Empty}" Fill="{DynamicResource Brush.FG2}"/> <Path Width="48" Height="48" Data="{StaticResource Icons.Empty}" Fill="{DynamicResource Brush.FG2}"/>
<TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.AssumeUnchanged.Empty}" Foreground="{DynamicResource Brush.FG2}"/> <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.AssumeUnchanged.Empty}" Foreground="{DynamicResource Brush.FG2}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Grid> </Grid>
</v:ChromelessWindow> </v:ChromelessWindow>

View file

@ -36,7 +36,7 @@
Text="{DynamicResource Text.Blame}" Text="{DynamicResource Text.Blame}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
IsHitTestVisible="False"/> IsHitTestVisible="False"/>
<!-- Caption Buttons (Windows/Linux) --> <!-- Caption Buttons (Windows/Linux) -->
<v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/> <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
</Grid> </Grid>

View file

@ -38,7 +38,7 @@
Text="{DynamicResource Text.BranchCompare}" Text="{DynamicResource Text.BranchCompare}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
IsHitTestVisible="False"/> IsHitTestVisible="False"/>
<!-- Caption Buttons (Windows/Linux) --> <!-- Caption Buttons (Windows/Linux) -->
<v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/> <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
</Grid> </Grid>
@ -89,7 +89,7 @@
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
</Border> </Border>
<!-- Changes --> <!-- Changes -->
<Border Grid.Row="2"> <Border Grid.Row="2">

View file

@ -20,14 +20,14 @@
</ItemsPanelTemplate> </ItemsPanelTemplate>
</Setter> </Setter>
</Style> </Style>
<Style Selector="ListBoxItem"> <Style Selector="ListBoxItem">
<Setter Property="Height" Value="24"/> <Setter Property="Height" Value="24"/>
<Setter Property="Margin" Value="0"/> <Setter Property="Margin" Value="0"/>
<Setter Property="Padding" Value="0"/> <Setter Property="Padding" Value="0"/>
</Style> </Style>
</UserControl.Styles> </UserControl.Styles>
<UserControl.DataTemplates> <UserControl.DataTemplates>
<DataTemplate DataType="vm:ChangeCollectionAsTree"> <DataTemplate DataType="vm:ChangeCollectionAsTree">
<v:ChangeCollectionContainer ItemsSource="{Binding Rows}" <v:ChangeCollectionContainer ItemsSource="{Binding Rows}"

View file

@ -27,7 +27,7 @@
</MenuItem> </MenuItem>
</MenuFlyout> </MenuFlyout>
</Button.Flyout> </Button.Flyout>
<Grid Width="14" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center"> <Grid Width="14" Height="14" HorizontalAlignment="Center" VerticalAlignment="Center">
<Path Width="14" Height="14" <Path Width="14" Height="14"
Data="{StaticResource Icons.List}" Data="{StaticResource Icons.List}"

View file

@ -12,7 +12,7 @@
<TextBlock FontSize="18" <TextBlock FontSize="18"
Classes="bold" Classes="bold"
Text="{DynamicResource Text.CherryPick}"/> Text="{DynamicResource Text.CherryPick}"/>
<Grid Margin="0,16,0,0" RowDefinitions="Auto,Auto,32,32" ColumnDefinitions="100,*"> <Grid Margin="0,16,0,0" RowDefinitions="Auto,Auto,32,32" ColumnDefinitions="100,*">
<TextBlock Grid.Row="0" Grid.Column="0" <TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0" Margin="0,0,8,0"
@ -73,15 +73,15 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<Border Grid.Column="1" <Border Grid.Column="1"
Background="Transparent" Background="Transparent"
ToolTip.Tip="{DynamicResource Text.CherryPick.Mainline.Tips}"> ToolTip.Tip="{DynamicResource Text.CherryPick.Mainline.Tips}">
<Path Grid.Column="1" <Path Grid.Column="1"
Width="14" Height="14" Width="14" Height="14"
Data="{StaticResource Icons.Info}"/> Data="{StaticResource Icons.Info}"/>
</Border> </Border>
</Grid> </Grid>
<CheckBox Grid.Row="2" Grid.Column="1" <CheckBox Grid.Row="2" Grid.Column="1"
Content="{DynamicResource Text.CherryPick.CommitChanges}" Content="{DynamicResource Text.CherryPick.CommitChanges}"
IsChecked="{Binding AutoCommit, Mode=TwoWay}"/> IsChecked="{Binding AutoCommit, Mode=TwoWay}"/>

View file

@ -11,14 +11,14 @@
<TextBlock Classes="bold" FontSize="18" Text="{DynamicResource Text.Clone}"/> <TextBlock Classes="bold" FontSize="18" Text="{DynamicResource Text.Clone}"/>
<Grid Margin="8,16,0,0" RowDefinitions="32,Auto,32,32,32,32" ColumnDefinitions="Auto,*"> <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,32,32,32,32" ColumnDefinitions="Auto,*">
<TextBlock Grid.Row="0" Grid.Column="0" <TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Margin="0,0,8,0" Margin="0,0,8,0"
Text="{DynamicResource Text.Clone.RemoteURL}"/> Text="{DynamicResource Text.Clone.RemoteURL}"/>
<TextBox Grid.Row="0" Grid.Column="1" <TextBox Grid.Row="0" Grid.Column="1"
Height="28" Height="28"
CornerRadius="3" CornerRadius="3"
Text="{Binding Remote, Mode=TwoWay}" Text="{Binding Remote, Mode=TwoWay}"
v:AutoFocusBehaviour.IsEnabled="True"/> v:AutoFocusBehaviour.IsEnabled="True"/>
<TextBlock Grid.Row="1" Grid.Column="0" <TextBlock Grid.Row="1" Grid.Column="0"
@ -40,9 +40,9 @@
</TextBox.InnerRightContent> </TextBox.InnerRightContent>
</TextBox> </TextBox>
<TextBlock Grid.Row="2" Grid.Column="0" <TextBlock Grid.Row="2" Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Margin="0,0,8,0" Margin="0,0,8,0"
Text="{DynamicResource Text.Clone.ParentFolder}"/> Text="{DynamicResource Text.Clone.ParentFolder}"/>
<TextBox Grid.Row="2" Grid.Column="1" <TextBox Grid.Row="2" Grid.Column="1"
x:Name="TxtParentFolder" x:Name="TxtParentFolder"
@ -56,24 +56,24 @@
</TextBox.InnerRightContent> </TextBox.InnerRightContent>
</TextBox> </TextBox>
<TextBlock Grid.Row="3" Grid.Column="0" <TextBlock Grid.Row="3" Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Margin="0,0,8,0" Margin="0,0,8,0"
Text="{DynamicResource Text.Clone.LocalName}"/> Text="{DynamicResource Text.Clone.LocalName}"/>
<TextBox Grid.Row="3" Grid.Column="1" <TextBox Grid.Row="3" Grid.Column="1"
Height="28" Height="28"
CornerRadius="3" CornerRadius="3"
Watermark="{DynamicResource Text.Clone.LocalName.Placeholder}" Watermark="{DynamicResource Text.Clone.LocalName.Placeholder}"
Text="{Binding Local, Mode=TwoWay}"/> Text="{Binding Local, Mode=TwoWay}"/>
<TextBlock Grid.Row="4" Grid.Column="0" <TextBlock Grid.Row="4" Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Margin="0,0,8,0" Margin="0,0,8,0"
Text="{DynamicResource Text.Clone.AdditionalParam}"/> Text="{DynamicResource Text.Clone.AdditionalParam}"/>
<TextBox Grid.Row="4" Grid.Column="1" <TextBox Grid.Row="4" Grid.Column="1"
Height="28" Height="28"
CornerRadius="3" CornerRadius="3"
Watermark="{DynamicResource Text.Clone.AdditionalParam.Placeholder}" Watermark="{DynamicResource Text.Clone.AdditionalParam.Placeholder}"
Text="{Binding ExtraArgs, Mode=TwoWay}"/> Text="{Binding ExtraArgs, Mode=TwoWay}"/>
<CheckBox Grid.Row="5" Grid.Column="1" <CheckBox Grid.Row="5" Grid.Column="1"

View file

@ -55,9 +55,9 @@
<!-- SHA --> <!-- SHA -->
<TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.SHA}" /> <TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.SHA}" />
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="24"> <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal" Height="24">
<TextBlock Classes="primary" <TextBlock Classes="primary"
Text="{Binding SHA}" Text="{Binding SHA}"
Margin="12,0,4,0" Margin="12,0,4,0"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
<Button Classes="icon_button" Width="24" Cursor="Hand" Click="OnCopyCommitSHA" ToolTip.Tip="{DynamicResource Text.Copy}"> <Button Classes="icon_button" Width="24" Cursor="Hand" Click="OnCopyCommitSHA" ToolTip.Tip="{DynamicResource Text.Copy}">
@ -184,12 +184,12 @@
<!-- Messages --> <!-- Messages -->
<TextBlock Grid.Row="4" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Message}" /> <TextBlock Grid.Row="4" Grid.Column="0" Classes="info_label" VerticalAlignment="Top" Margin="0,4,0,0" Text="{DynamicResource Text.CommitDetail.Info.Message}" />
<v:CommitMessagePresenter Grid.Row="4" Grid.Column="1" <v:CommitMessagePresenter Grid.Row="4" Grid.Column="1"
Margin="12,4,8,0" Margin="12,4,8,0"
Classes="primary" Classes="primary"
FullMessage="{Binding #ThisControl.FullMessage}" FullMessage="{Binding #ThisControl.FullMessage}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
TextWrapping="Wrap"> TextWrapping="Wrap">
<v:CommitMessagePresenter.DataTemplates> <v:CommitMessagePresenter.DataTemplates>
<DataTemplate DataType="m:Commit"> <DataTemplate DataType="m:Commit">
<StackPanel MinWidth="400" Orientation="Vertical"> <StackPanel MinWidth="400" Orientation="Vertical">

View file

@ -19,7 +19,7 @@
<Grid Grid.Row="0" ColumnDefinitions="*,Auto"> <Grid Grid.Row="0" ColumnDefinitions="*,Auto">
<TextBox Grid.Column="0" <TextBox Grid.Column="0"
Height="26" Height="26"
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
Background="Transparent" Background="Transparent"
CornerRadius="4" CornerRadius="4"
Watermark="{DynamicResource Text.CommitDetail.Changes.Search}" Watermark="{DynamicResource Text.CommitDetail.Changes.Search}"

View file

@ -19,7 +19,7 @@
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"> <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<!-- Base Information --> <!-- Base Information -->
<v:CommitBaseInfo Content="{Binding Commit}" <v:CommitBaseInfo Content="{Binding Commit}"
FullMessage="{Binding FullMessage}" FullMessage="{Binding FullMessage}"
SignInfo="{Binding SignInfo}" SignInfo="{Binding SignInfo}"
SupportsContainsIn="True" SupportsContainsIn="True"
@ -30,7 +30,7 @@
<Rectangle Height=".65" Margin="8" Fill="{DynamicResource Brush.Border2}"/> <Rectangle Height=".65" Margin="8" Fill="{DynamicResource Brush.Border2}"/>
<!-- Change List --> <!-- Change List -->
<ListBox Background="Transparent" <ListBox Background="Transparent"
Margin="64,0,8,4" Margin="64,0,8,4"
SelectionMode="Single" SelectionMode="Single"
ItemsSource="{Binding Changes, Converter={x:Static c:ListConverters.Top100Changes}}"> ItemsSource="{Binding Changes, Converter={x:Static c:ListConverters.Top100Changes}}">
@ -41,20 +41,20 @@
<Setter Property="CornerRadius" Value="4"/> <Setter Property="CornerRadius" Value="4"/>
</Style> </Style>
</ListBox.Styles> </ListBox.Styles>
<ListBox.ItemsPanel> <ListBox.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Vertical"/> <StackPanel Orientation="Vertical"/>
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ListBox.ItemsPanel> </ListBox.ItemsPanel>
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate DataType="m:Change"> <DataTemplate DataType="m:Change">
<Grid Background="Transparent" Height="24" ColumnDefinitions="36,*" ContextRequested="OnChangeContextRequested" DoubleTapped="OnChangeDoubleTapped"> <Grid Background="Transparent" Height="24" ColumnDefinitions="36,*" ContextRequested="OnChangeContextRequested" DoubleTapped="OnChangeDoubleTapped">
<v:ChangeStatusIcon Grid.Column="0" <v:ChangeStatusIcon Grid.Column="0"
Width="14" Height="14" Width="14" Height="14"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="16,0,0,0" Margin="16,0,0,0"
Change="{Binding}"/> Change="{Binding}"/>
<TextBlock Grid.Column="1" Classes="primary" Text="{Binding Path}" Margin="8,0" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis"/> <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Path}" Margin="8,0" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis"/>
</Grid> </Grid>
@ -63,8 +63,8 @@
</ListBox> </ListBox>
<!-- Only Top100 Tip --> <!-- Only Top100 Tip -->
<TextBlock Margin="108,0,0,16" <TextBlock Margin="108,0,0,16"
Text="{DynamicResource Text.CommitDetail.Info.GotoChangesPage}" Text="{DynamicResource Text.CommitDetail.Info.GotoChangesPage}"
Foreground="{DynamicResource Brush.FG2}" Foreground="{DynamicResource Brush.FG2}"
IsVisible="{Binding Changes, Converter={x:Static c:ListConverters.IsOnlyTop100Shows}}"/> IsVisible="{Binding Changes, Converter={x:Static c:ListConverters.IsOnlyTop100Shows}}"/>
</StackPanel> </StackPanel>

View file

@ -36,7 +36,7 @@
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
IsHitTestVisible="False" IsHitTestVisible="False"
Fill="{DynamicResource Brush.Border2}"/> Fill="{DynamicResource Brush.Border2}"/>
<StackPanel Grid.Column="2" <StackPanel Grid.Column="2"
Margin="8,0" Margin="8,0"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -48,7 +48,7 @@
<Path Width="10" Height="10" Margin="4,0,0,0" Data="{StaticResource Icons.Error}" Fill="DarkGoldenrod" IsVisible="{Binding #ThisControl.Subject.Length, Converter={x:Static c:IntConverters.IsSubjectLengthBad}}"/> <Path Width="10" Height="10" Margin="4,0,0,0" Data="{StaticResource Icons.Error}" Fill="DarkGoldenrod" IsVisible="{Binding #ThisControl.Subject.Length, Converter={x:Static c:IntConverters.IsSubjectLengthBad}}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
<Rectangle Grid.Row="1" <Rectangle Grid.Row="1"
Height="1" Height="1"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"

View file

@ -30,7 +30,7 @@
</ItemsControl.ItemTemplate> </ItemsControl.ItemTemplate>
</ItemsControl> </ItemsControl>
</ScrollViewer> </ScrollViewer>
<v:LoadingIcon x:Name="LoadingIcon" Grid.Row="2" HorizontalAlignment="Center" Margin="0,8" Width="14" Height="14" IsVisible="False"/> <v:LoadingIcon x:Name="LoadingIcon" Grid.Row="2" HorizontalAlignment="Center" Margin="0,8" Width="14" Height="14" IsVisible="False"/>
</Grid> </Grid>
</UserControl> </UserControl>

View file

@ -66,11 +66,11 @@
<Grid ColumnDefinitions="Auto,*,Auto"> <Grid ColumnDefinitions="Auto,*,Auto">
<Path Grid.Column="0" Margin="4,0" Width="14" Height="14" Data="{StaticResource Icons.Workspace}" Fill="{Binding Brush}"/> <Path Grid.Column="0" Margin="4,0" Width="14" Height="14" Data="{StaticResource Icons.Workspace}" Fill="{Binding Brush}"/>
<TextBlock Grid.Column="1" Text="{Binding Name}" Margin="4,0" TextTrimming="CharacterEllipsis"/> <TextBlock Grid.Column="1" Text="{Binding Name}" Margin="4,0" TextTrimming="CharacterEllipsis"/>
<Path Grid.Column="2" <Path Grid.Column="2"
Margin="4,0" Margin="4,0"
Width="14" Height="14" Width="14" Height="14"
Data="{StaticResource Icons.Check}" Data="{StaticResource Icons.Check}"
Fill="{DynamicResource Brush.FG1}" Fill="{DynamicResource Brush.FG1}"
IsVisible="{Binding IsActive}"/> IsVisible="{Binding IsActive}"/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>

View file

@ -52,7 +52,7 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
VerticalContentAlignment="Center"/> VerticalContentAlignment="Center"/>
<Button Classes="flat primary" <Button Classes="flat primary"
Width="80" Width="80"
Height="30" Height="30"

View file

@ -10,7 +10,7 @@
<TextBlock FontSize="18" <TextBlock FontSize="18"
Classes="bold" Classes="bold"
Text="{DynamicResource Text.DeleteBranch}"/> Text="{DynamicResource Text.DeleteBranch}"/>
<Grid Margin="0,16,8,0" RowDefinitions="32,Auto" ColumnDefinitions="120,*"> <Grid Margin="0,16,8,0" RowDefinitions="32,Auto" ColumnDefinitions="120,*">
<TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" Text="{DynamicResource Text.DeleteBranch.Branch}"/> <TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" Text="{DynamicResource Text.DeleteBranch.Branch}"/>
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal"> <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">

View file

@ -36,7 +36,7 @@
<TextBlock VerticalAlignment="Center" Text="{Binding Node.Name}"/> <TextBlock VerticalAlignment="Center" Text="{Binding Node.Name}"/>
</StackPanel> </StackPanel>
<TextBlock Grid.Row="1" Grid.Column="0" <TextBlock Grid.Row="1" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0" Margin="0,0,8,0"

View file

@ -24,6 +24,6 @@
<CheckBox Grid.Row="1" Grid.Column="1" <CheckBox Grid.Row="1" Grid.Column="1"
Content="{DynamicResource Text.DeleteTag.WithRemote}" Content="{DynamicResource Text.DeleteTag.WithRemote}"
IsChecked="{Binding PushToRemotes, Mode=TwoWay}"/> IsChecked="{Binding PushToRemotes, Mode=TwoWay}"/>
</Grid> </Grid>
</StackPanel> </StackPanel>
</UserControl> </UserControl>

View file

@ -46,7 +46,7 @@
</Button.IsVisible> </Button.IsVisible>
<Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Top}"/> <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Top}"/>
</Button> </Button>
<Button Classes="icon_button" <Button Classes="icon_button"
Width="28" Width="28"
Click="OnGotoPrevChange" Click="OnGotoPrevChange"
@ -54,7 +54,7 @@
ToolTip.Tip="{DynamicResource Text.Diff.Prev}"> ToolTip.Tip="{DynamicResource Text.Diff.Prev}">
<Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/> <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>
</Button> </Button>
<Border> <Border>
<Border.IsVisible> <Border.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}"> <MultiBinding Converter="{x:Static BoolConverters.And}">
@ -62,7 +62,7 @@
<Binding Source="{x:Static vm:Preferences.Instance}" Path="UseBlockNavigationInDiffView" Mode="OneWay"/> <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseBlockNavigationInDiffView" Mode="OneWay"/>
</MultiBinding> </MultiBinding>
</Border.IsVisible> </Border.IsVisible>
<TextBlock x:Name="BlockNavigationIndicator" Classes="primary" Margin="0,0,0,0" FontSize="11" Text="-/-"/> <TextBlock x:Name="BlockNavigationIndicator" Classes="primary" Margin="0,0,0,0" FontSize="11" Text="-/-"/>
</Border> </Border>
@ -73,7 +73,7 @@
ToolTip.Tip="{DynamicResource Text.Diff.Next}"> ToolTip.Tip="{DynamicResource Text.Diff.Next}">
<Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/> <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
</Button> </Button>
<Button Classes="icon_button" <Button Classes="icon_button"
Width="28" Width="28"
Click="OnGotoLastChange" Click="OnGotoLastChange"
@ -94,10 +94,10 @@
ToolTip.Tip="{DynamicResource Text.Diff.UseBlockNavigation}"> ToolTip.Tip="{DynamicResource Text.Diff.UseBlockNavigation}">
<Path Width="13" Height="13" Data="{StaticResource Icons.CodeBlock}" Margin="0,3,0,0"/> <Path Width="13" Height="13" Data="{StaticResource Icons.CodeBlock}" Margin="0,3,0,0"/>
</ToggleButton> </ToggleButton>
<Button Classes="icon_button" <Button Classes="icon_button"
Width="28" Width="28"
Command="{Binding IncrUnified}" Command="{Binding IncrUnified}"
IsVisible="{Binding IsTextDiff}" IsVisible="{Binding IsTextDiff}"
ToolTip.Tip="{DynamicResource Text.Diff.VisualLines.Incr}"> ToolTip.Tip="{DynamicResource Text.Diff.VisualLines.Incr}">
<Button.IsEnabled> <Button.IsEnabled>
@ -106,10 +106,10 @@
<Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Lines.Incr}"/> <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Lines.Incr}"/>
</Button> </Button>
<Button Classes="icon_button" <Button Classes="icon_button"
Width="28" Width="28"
Command="{Binding DecrUnified}" Command="{Binding DecrUnified}"
IsVisible="{Binding IsTextDiff}" IsVisible="{Binding IsTextDiff}"
ToolTip.Tip="{DynamicResource Text.Diff.VisualLines.Decr}"> ToolTip.Tip="{DynamicResource Text.Diff.VisualLines.Decr}">
<Button.IsEnabled> <Button.IsEnabled>
<MultiBinding Converter="{x:Static BoolConverters.And}"> <MultiBinding Converter="{x:Static BoolConverters.And}">
@ -119,7 +119,7 @@
</Button.IsEnabled> </Button.IsEnabled>
<Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Lines.Decr}"/> <Path Width="12" Height="12" Stretch="Uniform" Margin="0,6,0,0" Data="{StaticResource Icons.Lines.Decr}"/>
</Button> </Button>
<ToggleButton Classes="line_path" <ToggleButton Classes="line_path"
Width="28" Width="28"
Command="{Binding ToggleFullTextDiff}" Command="{Binding ToggleFullTextDiff}"
@ -148,7 +148,7 @@
<Binding Source="{x:Static vm:Preferences.Instance}" Path="UseSideBySideDiff" Mode="OneWay" Converter="{x:Static BoolConverters.Not}"/> <Binding Source="{x:Static vm:Preferences.Instance}" Path="UseSideBySideDiff" Mode="OneWay" Converter="{x:Static BoolConverters.Not}"/>
</MultiBinding> </MultiBinding>
</ToggleButton.IsVisible> </ToggleButton.IsVisible>
<Path Width="12" Height="12" Data="{StaticResource Icons.WordWrap}" Margin="0,2,0,0"/> <Path Width="12" Height="12" Data="{StaticResource Icons.WordWrap}" Margin="0,2,0,0"/>
</ToggleButton> </ToggleButton>

View file

@ -11,16 +11,16 @@
<TextBlock FontSize="18" <TextBlock FontSize="18"
Classes="bold" Classes="bold"
Text="{DynamicResource Text.Discard}"/> Text="{DynamicResource Text.Discard}"/>
<StackPanel Margin="0,6,0,0" Orientation="Horizontal"> <StackPanel Margin="0,6,0,0" Orientation="Horizontal">
<Path Width="14" Height="14" <Path Width="14" Height="14"
Data="{StaticResource Icons.Error}" Data="{StaticResource Icons.Error}"
Fill="DarkOrange"/> Fill="DarkOrange"/>
<TextBlock Margin="4,0,0,0" <TextBlock Margin="4,0,0,0"
Text="{DynamicResource Text.Discard.Warning}" Text="{DynamicResource Text.Discard.Warning}"
Foreground="DarkOrange"/> Foreground="DarkOrange"/>
</StackPanel> </StackPanel>
<ContentControl Margin="0,16,0,8" Content="{Binding Mode}"> <ContentControl Margin="0,16,0,8" Content="{Binding Mode}">
<ContentControl.DataTemplates> <ContentControl.DataTemplates>
<DataTemplate DataType="vm:DiscardAllMode"> <DataTemplate DataType="vm:DiscardAllMode">
@ -31,13 +31,13 @@
Text="{DynamicResource Text.Discard.Changes}"/> Text="{DynamicResource Text.Discard.Changes}"/>
<TextBlock Grid.Row="0" Grid.Column="1" <TextBlock Grid.Row="0" Grid.Column="1"
Text="{DynamicResource Text.Discard.All}"/> Text="{DynamicResource Text.Discard.All}"/>
<CheckBox Grid.Row="1" Grid.Column="1" <CheckBox Grid.Row="1" Grid.Column="1"
Content="{DynamicResource Text.Discard.IncludeIgnored}" Content="{DynamicResource Text.Discard.IncludeIgnored}"
IsChecked="{Binding IncludeIgnored, Mode=TwoWay}"/> IsChecked="{Binding IncludeIgnored, Mode=TwoWay}"/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="vm:DiscardSingleFile"> <DataTemplate DataType="vm:DiscardSingleFile">
<Grid Height="32" ColumnDefinitions="120,*"> <Grid Height="32" ColumnDefinitions="120,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
@ -50,7 +50,7 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="vm:DiscardMultipleFiles"> <DataTemplate DataType="vm:DiscardMultipleFiles">
<Grid Height="32" ColumnDefinitions="120,*"> <Grid Height="32" ColumnDefinitions="120,*">
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
@ -59,7 +59,7 @@
Text="{DynamicResource Text.Discard.Changes}"/> Text="{DynamicResource Text.Discard.Changes}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal"> <StackPanel Grid.Column="1" Orientation="Horizontal">
<Path Width="12" Height="12" Data="{StaticResource Icons.File}"/> <Path Width="12" Height="12" Data="{StaticResource Icons.File}"/>
<TextBlock Text="{Binding Count, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Discard.Total'}" <TextBlock Text="{Binding Count, Converter={x:Static c:StringConverters.FormatByResourceKey}, ConverterParameter='Discard.Total'}"
Margin="4,0,0,0"/> Margin="4,0,0,0"/>
</StackPanel> </StackPanel>
</Grid> </Grid>

View file

@ -43,7 +43,7 @@
Fill="{Binding Converter={x:Static c:IntConverters.ToBookmarkBrush}}" Fill="{Binding Converter={x:Static c:IntConverters.ToBookmarkBrush}}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
Data="{StaticResource Icons.Bookmark}"/> Data="{StaticResource Icons.Bookmark}"/>
</Border> </Border>
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>

View file

@ -37,7 +37,7 @@
Text="{DynamicResource Text.FileHistory}" Text="{DynamicResource Text.FileHistory}"
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
IsHitTestVisible="False"/> IsHitTestVisible="False"/>
<!-- Caption Buttons (Windows/Linux) --> <!-- Caption Buttons (Windows/Linux) -->
<v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/> <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
</Grid> </Grid>
@ -184,7 +184,7 @@
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</Grid.DataTemplates> </Grid.DataTemplates>
<Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4"> <Border Grid.Column="0" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
<ContentControl Content="{Binding StartPoint}"/> <ContentControl Content="{Binding StartPoint}"/>
</Border> </Border>
@ -234,7 +234,7 @@
HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"
IsVisible="{Binding IsLoading}"/> IsVisible="{Binding IsLoading}"/>
</Grid> </Grid>
<Border Grid.Row="1" x:Name="NotifyDonePanel" Background="Transparent" IsVisible="False" PointerPressed="OnCloseNotifyPanel"> <Border Grid.Row="1" x:Name="NotifyDonePanel" Background="Transparent" IsVisible="False" PointerPressed="OnCloseNotifyPanel">
<Border HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 12 #80000000)"> <Border HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 12 #80000000)">
<Border CornerRadius="8" Background="{DynamicResource Brush.Popup}" Padding="32"> <Border CornerRadius="8" Background="{DynamicResource Brush.Popup}" Padding="32">

View file

@ -5,7 +5,7 @@
xmlns:m="using:SourceGit.Models" xmlns:m="using:SourceGit.Models"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.FilterModeSwitchButton" x:Class="SourceGit.Views.FilterModeSwitchButton"
x:Name="ThisControl"> x:Name="ThisControl">
<Button Classes="icon_button" <Button Classes="icon_button"
Width="12" Height="12" Width="12" Height="12"
Padding="0" Padding="0"

View file

@ -22,7 +22,7 @@
<ColumnDefinition Width="3"/> <ColumnDefinition Width="3"/>
<ColumnDefinition Width="{Binding RightArea, Mode=TwoWay}" MinWidth="100"/> <ColumnDefinition Width="{Binding RightArea, Mode=TwoWay}" MinWidth="100"/>
</v:HistoriesLayout.ColumnDefinitions> </v:HistoriesLayout.ColumnDefinitions>
<Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3"> <Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
<Grid RowDefinitions="24,*" Grid.IsSharedSizeScope="True"> <Grid RowDefinitions="24,*" Grid.IsSharedSizeScope="True">
<!-- Headers --> <!-- Headers -->
@ -132,7 +132,7 @@
Background="Transparent" Background="Transparent"
ToolTip.Tip="{Binding Subject}"> ToolTip.Tip="{Binding Subject}">
<Grid ColumnDefinitions="Auto,Auto,*" Margin="2,0,4,0" ClipToBounds="True"> <Grid ColumnDefinitions="Auto,Auto,*" Margin="2,0,4,0" ClipToBounds="True">
<v:CommitStatusIndicator Grid.Column="0" <v:CommitStatusIndicator Grid.Column="0"
CurrentBranch="{Binding $parent[v:Histories].CurrentBranch}" CurrentBranch="{Binding $parent[v:Histories].CurrentBranch}"
AheadBrush="{DynamicResource Brush.Accent}" AheadBrush="{DynamicResource Brush.Accent}"
BehindBrush="{DynamicResource Brush.FG1}" BehindBrush="{DynamicResource Brush.FG1}"
@ -177,7 +177,7 @@
Opacity="{Binding Opacity}"/> Opacity="{Binding Opacity}"/>
<Border Grid.Column="1" Padding="8,0,0,0" ClipToBounds="True"> <Border Grid.Column="1" Padding="8,0,0,0" ClipToBounds="True">
<TextBlock Classes="primary" <TextBlock Classes="primary"
Text="{Binding Author.Name}" Text="{Binding Author.Name}"
FontWeight="{Binding FontWeight}" FontWeight="{Binding FontWeight}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@ -218,7 +218,7 @@
ClipToBounds="True"/> ClipToBounds="True"/>
</Grid> </Grid>
</Grid> </Grid>
<!-- Fix memory leak --> <!-- Fix memory leak -->
<v:LoadingIcon Width="48" Height="48" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding IsLoading}"/> <v:LoadingIcon Width="48" Height="48" HorizontalAlignment="Center" VerticalAlignment="Center" IsVisible="{Binding IsLoading}"/>
</Grid> </Grid>
@ -228,7 +228,7 @@
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
Background="{DynamicResource Brush.Window}" Background="{DynamicResource Brush.Window}"
BorderBrush="{DynamicResource Brush.Border0}"/> BorderBrush="{DynamicResource Brush.Border0}"/>
<Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3"> <Grid Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="3">
<Grid IsVisible="{Binding DetailContext, Converter={x:Static ObjectConverters.IsNull}}"> <Grid IsVisible="{Binding DetailContext, Converter={x:Static ObjectConverters.IsNull}}">
<Path Width="128" Height="128" <Path Width="128" Height="128"
@ -243,7 +243,7 @@
<TextBlock Text="{DynamicResource Text.Histories.Tips.MacOS}" Foreground="{DynamicResource Brush.FG2}" IsVisible="{OnPlatform False, macOS=True}"/> <TextBlock Text="{DynamicResource Text.Histories.Tips.MacOS}" Foreground="{DynamicResource Brush.FG2}" IsVisible="{OnPlatform False, macOS=True}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
<ContentControl Content="{Binding DetailContext}"> <ContentControl Content="{Binding DetailContext}">
<ContentControl.DataTemplates> <ContentControl.DataTemplates>
<DataTemplate DataType="vm:CommitDetail"> <DataTemplate DataType="vm:CommitDetail">

View file

@ -19,7 +19,7 @@
<Border Background="{DynamicResource Brush.TitleBar}" <Border Background="{DynamicResource Brush.TitleBar}"
BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"
PointerPressed="BeginMoveWindow"/> PointerPressed="BeginMoveWindow"/>
<Path Width="14" Height="14" <Path Width="14" Height="14"
Margin="10,0,0,0" Margin="10,0,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
@ -48,7 +48,7 @@
<Grid RowDefinitions="20,20,20,20,20,20,20,20" ColumnDefinitions="150,*"> <Grid RowDefinitions="20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
<TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+P, macOS=⌘+\,}"/> <TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+P, macOS=⌘+\,}"/>
<TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.OpenPreferences}"/> <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.OpenPreferences}"/>
<TextBlock Grid.Row="1" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+T, macOS=⌘+T}"/> <TextBlock Grid.Row="1" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+T, macOS=⌘+T}"/>
<TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.NewTab}" /> <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.NewTab}" />
@ -80,7 +80,7 @@
<Grid RowDefinitions="20,20,20,20,20,20,20,20,20,20,20,20,20,20,20" ColumnDefinitions="150,*"> <Grid RowDefinitions="20,20,20,20,20,20,20,20,20,20,20,20,20,20,20" ColumnDefinitions="150,*">
<TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+H, macOS=⌘+⇧+H}"/> <TextBlock Grid.Row="0" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+H, macOS=⌘+⇧+H}"/>
<TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.GoHome}" /> <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.GoHome}" />
<TextBlock Grid.Row="1" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/> <TextBlock Grid.Row="1" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
<TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.OpenSearchCommits}" /> <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.OpenSearchCommits}" />
@ -95,13 +95,13 @@
<TextBlock Grid.Row="5" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Space/Enter, macOS=␣/Enter}"/> <TextBlock Grid.Row="5" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Space/Enter, macOS=␣/Enter}"/>
<TextBlock Grid.Row="5" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.StageOrUnstageSelected}" /> <TextBlock Grid.Row="5" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.StageOrUnstageSelected}" />
<TextBlock Grid.Row="6" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Delete/Backspace, macOS=⌫}"/> <TextBlock Grid.Row="6" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Delete/Backspace, macOS=⌫}"/>
<TextBlock Grid.Row="6" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.DiscardSelected}" /> <TextBlock Grid.Row="6" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.DiscardSelected}" />
<TextBlock Grid.Row="7" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Enter, macOS=⌘+Enter}"/> <TextBlock Grid.Row="7" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Enter, macOS=⌘+Enter}"/>
<TextBlock Grid.Row="7" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Commit}" /> <TextBlock Grid.Row="7" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.Commit}" />
<TextBlock Grid.Row="8" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+⇧+Enter}"/> <TextBlock Grid.Row="8" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+Enter, macOS=⌘+⇧+Enter}"/>
<TextBlock Grid.Row="8" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.CommitWithAutoStage}" /> <TextBlock Grid.Row="8" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.CommitWithAutoStage}" />
@ -144,6 +144,6 @@
<TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.CloseSearch}" /> <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.CloseSearch}" />
</Grid> </Grid>
</StackPanel> </StackPanel>
</Border> </Border>
</Grid> </Grid>
</v:ChromelessWindow> </v:ChromelessWindow>

View file

@ -40,7 +40,7 @@
</Border> </Border>
</Border> </Border>
</Grid> </Grid>
<Grid RowDefinitions="Auto,*" Margin="16,0" IsVisible="{Binding New, Converter={x:Static ObjectConverters.IsNotNull}}"> <Grid RowDefinitions="Auto,*" Margin="16,0" IsVisible="{Binding New, Converter={x:Static ObjectConverters.IsNotNull}}">
<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center"> <StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">
<Border Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center"> <Border Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center">
@ -67,7 +67,7 @@
<TabItem.Header> <TabItem.Header>
<TextBlock Text="SWIPE" FontSize="11"/> <TextBlock Text="SWIPE" FontSize="11"/>
</TabItem.Header> </TabItem.Header>
<Grid RowDefinitions="Auto,*" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16"> <Grid RowDefinitions="Auto,*" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16">
<Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" HorizontalAlignment="Center"> <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" HorizontalAlignment="Center">
<Border Grid.Column="0" Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center"> <Border Grid.Column="0" Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
@ -86,13 +86,13 @@
<TextBlock Grid.Column="6" Classes="primary" Text="{Binding NewFileSize}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/> <TextBlock Grid.Column="6" Classes="primary" Text="{Binding NewFileSize}" Foreground="{DynamicResource Brush.FG2}" Margin="16,0,0,0"/>
<TextBlock Grid.Column="7" Classes="primary" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" Margin="2,0,0,0"/> <TextBlock Grid.Column="7" Classes="primary" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" Margin="2,0,0,0"/>
</Grid> </Grid>
<Border Grid.Row="1" Margin="0,12,0,0" Effect="drop-shadow(0 0 8 #A0000000)"> <Border Grid.Row="1" Margin="0,12,0,0" Effect="drop-shadow(0 0 8 #A0000000)">
<Border HorizontalAlignment="Center" Background="{DynamicResource Brush.Window}"> <Border HorizontalAlignment="Center" Background="{DynamicResource Brush.Window}">
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}" Margin="8"> <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border1}" Margin="8">
<v:ImageSwipeControl OldImage="{Binding Old}" <v:ImageSwipeControl OldImage="{Binding Old}"
NewImage="{Binding New}" NewImage="{Binding New}"
RenderOptions.BitmapInterpolationMode="HighQuality"/> RenderOptions.BitmapInterpolationMode="HighQuality"/>
</Border> </Border>
</Border> </Border>
</Border> </Border>
@ -103,7 +103,7 @@
<TabItem.Header> <TabItem.Header>
<TextBlock Text="BLEND" FontSize="11"/> <TextBlock Text="BLEND" FontSize="11"/>
</TabItem.Header> </TabItem.Header>
<Grid RowDefinitions="Auto,*,Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16,8,0"> <Grid RowDefinitions="Auto,*,Auto" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="8,16,8,0">
<Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" HorizontalAlignment="Center"> <Grid Grid.Row="0" ColumnDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto" HorizontalAlignment="Center">
<Border Grid.Column="0" Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center"> <Border Grid.Column="0" Height="16" Background="{DynamicResource Brush.Badge}" CornerRadius="8" VerticalAlignment="Center">
@ -135,7 +135,7 @@
<Grid Grid.Row="2" ColumnDefinitions="100,200,100" Margin="0,12,0,0" HorizontalAlignment="Center"> <Grid Grid.Row="2" ColumnDefinitions="100,200,100" Margin="0,12,0,0" HorizontalAlignment="Center">
<StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,8,0"> <StackPanel Grid.Column="0" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,0,8,0">
<TextBlock Classes="primary" Text="OLD"/> <TextBlock Classes="primary" Text="OLD"/>
<TextBlock Classes="primary" <TextBlock Classes="primary"
Margin="8,0,0,0" Margin="8,0,0,0"
Text="{Binding #ImageBlendSlider.Value, Converter={x:Static c:DoubleConverters.OneMinusToPercentage}}" Text="{Binding #ImageBlendSlider.Value, Converter={x:Static c:DoubleConverters.OneMinusToPercentage}}"

View file

@ -15,7 +15,7 @@
<RowDefinition Height="32"/> <RowDefinition Height="32"/>
<RowDefinition Height="Auto" MinHeight="32"/> <RowDefinition Height="Auto" MinHeight="32"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.Column="0" <TextBlock Grid.Row="0" Grid.Column="0"
Text="{DynamicResource Text.Init.Path}" Text="{DynamicResource Text.Init.Path}"
HorizontalAlignment="Right" VerticalAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center"

View file

@ -48,7 +48,7 @@
<TextBlock Grid.Column="5" Classes="primary" VerticalAlignment="Center" Text="{Binding On.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/> <TextBlock Grid.Column="5" Classes="primary" VerticalAlignment="Center" Text="{Binding On.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
<TextBlock Grid.Column="6" VerticalAlignment="Center" Text="{Binding On.Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/> <TextBlock Grid.Column="6" VerticalAlignment="Center" Text="{Binding On.Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>
</Grid> </Grid>
<!-- Body --> <!-- Body -->
<Border Grid.Row="2" Margin="8,0,8,8" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"> <Border Grid.Row="2" Margin="8,0,8,8" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
<Grid RowDefinitions="*,3,*"> <Grid RowDefinitions="*,3,*">
@ -91,13 +91,13 @@
<ColumnDefinition Width="32"/> <ColumnDefinition Width="32"/>
<ColumnDefinition Width="32"/> <ColumnDefinition Width="32"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- Drag & Drop Anchor --> <!-- Drag & Drop Anchor -->
<Border Grid.Column="0" Background="Transparent" <Border Grid.Column="0" Background="Transparent"
Loaded="OnSetupRowHeaderDragDrop" Loaded="OnSetupRowHeaderDragDrop"
PointerPressed="OnRowHeaderPointerPressed"> PointerPressed="OnRowHeaderPointerPressed">
<Path Width="14" Height="14" <Path Width="14" Height="14"
Data="{StaticResource Icons.Move}" Data="{StaticResource Icons.Move}"
Fill="{DynamicResource Brush.FG2}" Fill="{DynamicResource Brush.FG2}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
@ -258,7 +258,7 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
Fill="{DynamicResource Brush.FG2}" Fill="{DynamicResource Brush.FG2}"
IsVisible="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNull}}"/> IsVisible="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNull}}"/>
<ContentControl Content="{Binding DetailContext}" IsVisible="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}"> <ContentControl Content="{Binding DetailContext}" IsVisible="{Binding SelectedItem, Converter={x:Static ObjectConverters.IsNotNull}}">
<ContentControl.DataTemplates> <ContentControl.DataTemplates>
<DataTemplate DataType="vm:CommitDetail"> <DataTemplate DataType="vm:CommitDetail">
@ -272,12 +272,12 @@
<!-- Options --> <!-- Options -->
<Grid Grid.Row="3" ColumnDefinitions="*,Auto,Auto" Margin="8,0,8,8"> <Grid Grid.Row="3" ColumnDefinitions="*,Auto,Auto" Margin="8,0,8,8">
<ProgressBar x:Name="Running" <ProgressBar x:Name="Running"
Grid.Column="0" Grid.Column="0"
Margin="0,0,32,0" Margin="0,0,32,0"
Background="{DynamicResource Brush.FG2}" Background="{DynamicResource Brush.FG2}"
Foreground="{DynamicResource Brush.Accent}" Foreground="{DynamicResource Brush.Accent}"
Minimum="0" Minimum="0"
Maximum="100" Maximum="100"
IsVisible="False"/> IsVisible="False"/>
<Button Grid.Column="1" Classes="flat primary" MinWidth="80" Content="{DynamicResource Text.Start}" Click="StartJobs"/> <Button Grid.Column="1" Classes="flat primary" MinWidth="80" Content="{DynamicResource Text.Start}" Click="StartJobs"/>

View file

@ -31,8 +31,8 @@
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<TextBlock Grid.Row="1" Grid.Column="1" <TextBlock Grid.Row="1" Grid.Column="1"
Text="{DynamicResource Text.GitLFS.Fetch.Tips}" Text="{DynamicResource Text.GitLFS.Fetch.Tips}"
Margin="0,8,0,0" Margin="0,8,0,0"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>

View file

@ -84,7 +84,7 @@
</Border> </Border>
<Border Grid.Column="2" Margin="8,0" ClipToBounds="True"> <Border Grid.Column="2" Margin="8,0" ClipToBounds="True">
<TextBlock Text="{Binding User}" HorizontalAlignment="Left"/> <TextBlock Text="{Binding User}" HorizontalAlignment="Left"/>
</Border> </Border>
<Button Grid.Column="3" Classes="icon_button" Click="OnUnlockButtonClicked" ToolTip.Tip="{DynamicResource Text.GitLFS.Locks.Unlock}"> <Button Grid.Column="3" Classes="icon_button" Click="OnUnlockButtonClicked" ToolTip.Tip="{DynamicResource Text.GitLFS.Locks.Unlock}">
<Path Width="14" Height="14" Data="{StaticResource Icons.Unlock}"/> <Path Width="14" Height="14" Data="{StaticResource Icons.Unlock}"/>
</Button> </Button>
@ -104,7 +104,7 @@
<Binding Path="VisibleLocks" Converter="{x:Static c:ListConverters.IsNullOrEmpty}"/> <Binding Path="VisibleLocks" Converter="{x:Static c:ListConverters.IsNullOrEmpty}"/>
</MultiBinding> </MultiBinding>
</StackPanel.IsVisible> </StackPanel.IsVisible>
<Path Width="48" Height="48" Data="{StaticResource Icons.Empty}" Fill="{DynamicResource Brush.FG2}"/> <Path Width="48" Height="48" Data="{StaticResource Icons.Empty}" Fill="{DynamicResource Brush.FG2}"/>
<TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.GitLFS.Locks.Empty}" Foreground="{DynamicResource Brush.FG2}"/> <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.GitLFS.Locks.Empty}" Foreground="{DynamicResource Brush.FG2}"/>
</StackPanel> </StackPanel>

View file

@ -11,7 +11,7 @@
<TextBlock FontSize="18" <TextBlock FontSize="18"
Classes="bold" Classes="bold"
Text="{DynamicResource Text.GitLFS.AddTrackPattern.Title}"/> Text="{DynamicResource Text.GitLFS.AddTrackPattern.Title}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*"> <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
<TextBlock Grid.Row="0" Grid.Column="0" <TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center"

View file

@ -12,7 +12,7 @@
Icon="/App.ico" Icon="/App.ico"
Title="{Binding Title}" Title="{Binding Title}"
MinWidth="1024" MinHeight="600" MinWidth="1024" MinHeight="600"
WindowStartupLocation="CenterScreen"> WindowStartupLocation="CenterScreen">
<Grid> <Grid>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="{Binding #ThisControl.CaptionHeight}"/> <RowDefinition Height="{Binding #ThisControl.CaptionHeight}"/>
@ -80,7 +80,7 @@
<TextBlock Text="{Binding ActiveWorkspace.Name}"/> <TextBlock Text="{Binding ActiveWorkspace.Name}"/>
</StackPanel> </StackPanel>
</ToolTip.Tip> </ToolTip.Tip>
<Path Width="14" Height="14" <Path Width="14" Height="14"
Data="{StaticResource Icons.Workspace}" Data="{StaticResource Icons.Workspace}"
Fill="{Binding ActiveWorkspace.Brush}"/> Fill="{Binding ActiveWorkspace.Brush}"/>
</Button> </Button>
@ -93,7 +93,7 @@
<v:CaptionButtons Height="30" VerticalAlignment="Top"/> <v:CaptionButtons Height="30" VerticalAlignment="Top"/>
</Border> </Border>
</Grid> </Grid>
<!-- Page --> <!-- Page -->
<ContentControl Grid.Row="1" Content="{Binding ActivePage}"> <ContentControl Grid.Row="1" Content="{Binding ActivePage}">
<ContentControl.DataTemplates> <ContentControl.DataTemplates>

View file

@ -17,14 +17,14 @@
<DataTemplate DataType="vm:Welcome"> <DataTemplate DataType="vm:Welcome">
<v:WelcomeToolbar/> <v:WelcomeToolbar/>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="vm:Repository"> <DataTemplate DataType="vm:Repository">
<v:RepositoryToolbar/> <v:RepositoryToolbar/>
</DataTemplate> </DataTemplate>
</ContentControl.DataTemplates> </ContentControl.DataTemplates>
</ContentControl> </ContentControl>
</Border> </Border>
<!-- Body --> <!-- Body -->
<Border Grid.Row="1"> <Border Grid.Row="1">
<ContentControl Content="{Binding Data}"> <ContentControl Content="{Binding Data}">
@ -32,7 +32,7 @@
<DataTemplate DataType="vm:Welcome"> <DataTemplate DataType="vm:Welcome">
<v:Welcome/> <v:Welcome/>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="vm:Repository"> <DataTemplate DataType="vm:Repository">
<v:Repository/> <v:Repository/>
</DataTemplate> </DataTemplate>
@ -138,7 +138,7 @@
</Button> </Button>
<Button Grid.Column="3" Classes="icon_button" Width="16" Height="16" Margin="8,0,0,0" Click="OnDismissNotification"> <Button Grid.Column="3" Classes="icon_button" Width="16" Height="16" Margin="8,0,0,0" Click="OnDismissNotification">
<Path Width="10" Height="10" Data="{StaticResource Icons.Window.Close}"/> <Path Width="10" Height="10" Data="{StaticResource Icons.Window.Close}"/>
</Button> </Button>
</Grid> </Grid>
<ScrollViewer Grid.Row="1" Margin="8" MaxHeight="200" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"> <ScrollViewer Grid.Row="1" Margin="8" MaxHeight="200" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">

View file

@ -54,7 +54,7 @@
<TextBlock Text="{Binding Node.Id}" IsVisible="{Binding Node.IsRepository}"/> <TextBlock Text="{Binding Node.Id}" IsVisible="{Binding Node.IsRepository}"/>
</Grid> </Grid>
</ToolTip.Tip> </ToolTip.Tip>
<Grid Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFixedTabWidth, Converter={x:Static c:BoolConverters.ToPageTabWidth}}" Height="30" ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center"> <Grid Width="{Binding Source={x:Static vm:Preferences.Instance}, Path=UseFixedTabWidth, Converter={x:Static c:BoolConverters.ToPageTabWidth}}" Height="30" ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center">
<Path Grid.Column="0" <Path Grid.Column="0"
Width="12" Height="12" Margin="12,0" Width="12" Height="12" Margin="12,0"

View file

@ -70,7 +70,7 @@
<ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeDescriptionColumn"/> <ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeDescriptionColumn"/>
<ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeOptionColumn"/> <ColumnDefinition Width="Auto" SharedSizeGroup="MergeModeOptionColumn"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" Text="{Binding Name}"/> <TextBlock Grid.Column="0" Text="{Binding Name}"/>
<TextBlock Grid.Column="1" Text="{Binding Desc}" Margin="8,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/> <TextBlock Grid.Column="1" Text="{Binding Desc}" Margin="8,0" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>
<TextBlock Grid.Column="2" Text="{Binding Arg}" HorizontalAlignment="Right" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/> <TextBlock Grid.Column="2" Text="{Binding Arg}" HorizontalAlignment="Right" FontSize="11" Foreground="{DynamicResource Brush.FG2}"/>

View file

@ -12,7 +12,7 @@
<TextBlock FontSize="18" <TextBlock FontSize="18"
Classes="bold" Classes="bold"
Text="{DynamicResource Text.MergeMultiple}"/> Text="{DynamicResource Text.MergeMultiple}"/>
<Grid Margin="0,16,0,0" RowDefinitions="Auto,32,32" ColumnDefinitions="100,*"> <Grid Margin="0,16,0,0" RowDefinitions="Auto,32,32" ColumnDefinitions="100,*">
<TextBlock Grid.Row="0" Grid.Column="0" <TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Top" HorizontalAlignment="Right" VerticalAlignment="Top"
@ -62,7 +62,7 @@
</DataTemplate> </DataTemplate>
</ContentControl.DataTemplates> </ContentControl.DataTemplates>
</ContentControl> </ContentControl>
</DataTemplate> </DataTemplate>
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
@ -84,7 +84,7 @@
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<CheckBox Grid.Row="2" Grid.Column="1" <CheckBox Grid.Row="2" Grid.Column="1"
Content="{DynamicResource Text.MergeMultiple.CommitChanges}" Content="{DynamicResource Text.MergeMultiple.CommitChanges}"
IsChecked="{Binding AutoCommit, Mode=TwoWay}"/> IsChecked="{Binding AutoCommit, Mode=TwoWay}"/>

View file

@ -9,19 +9,19 @@
x:Name="ThisControl"> x:Name="ThisControl">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<Rectangle Height="1" HorizontalAlignment="Stretch" Fill="{DynamicResource Brush.Border1}" /> <Rectangle Height="1" HorizontalAlignment="Stretch" Fill="{DynamicResource Brush.Border1}" />
<StackPanel Orientation="Horizontal" Margin="0,8"> <StackPanel Orientation="Horizontal" Margin="0,8">
<ContentPresenter x:Name="Icon" Width="12" Height="12"/> <ContentPresenter x:Name="Icon" Width="12" Height="12"/>
<TextBlock Margin="6,0,0,0" FontSize="14" FontWeight="Bold" Text="{DynamicResource Text.Running}"/> <TextBlock Margin="6,0,0,0" FontSize="14" FontWeight="Bold" Text="{DynamicResource Text.Running}"/>
</StackPanel> </StackPanel>
<TextBlock x:Name="TxtDesc" <TextBlock x:Name="TxtDesc"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
TextWrapping="Wrap" TextWrapping="Wrap"
FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}" FontSize="{Binding Source={x:Static vm:Preferences.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
FontStyle="Italic" FontStyle="Italic"
Text="{Binding #ThisControl.Description}"/> Text="{Binding #ThisControl.Description}"/>
<ProgressBar x:Name="ProgressBar" <ProgressBar x:Name="ProgressBar"
Margin="0,8,0,0" Margin="0,8,0,0"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"

View file

@ -78,7 +78,7 @@
</DataTemplate> </DataTemplate>
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
<TextBlock Grid.Row="2" Grid.Column="0" <TextBlock Grid.Row="2" Grid.Column="0"
Text="{DynamicResource Text.Preferences.Git.DefaultCloneDir}" Text="{DynamicResource Text.Preferences.Git.DefaultCloneDir}"
HorizontalAlignment="Right" HorizontalAlignment="Right"
@ -537,7 +537,7 @@
<ColumnDefinition Width="200"/> <ColumnDefinition Width="200"/>
<ColumnDefinition Width="*" MaxWidth="400"/> <ColumnDefinition Width="*" MaxWidth="400"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Grid.Column="0" <Border Grid.Column="0"
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
Background="{DynamicResource Brush.Contents}"> Background="{DynamicResource Brush.Contents}">
@ -635,7 +635,7 @@
</ContentControl> </ContentControl>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.AI}"/> <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preferences.AI}"/>
@ -646,7 +646,7 @@
<ColumnDefinition Width="200"/> <ColumnDefinition Width="200"/>
<ColumnDefinition Width="*" MaxWidth="400"/> <ColumnDefinition Width="*" MaxWidth="400"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border Grid.Column="0" <Border Grid.Column="0"
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
Background="{DynamicResource Brush.Contents}"> Background="{DynamicResource Brush.Contents}">
@ -725,8 +725,8 @@
<TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.ApiKey}"/> <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.ApiKey}"/>
<TextBox Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding ApiKey, Mode=TwoWay}" PasswordChar="*"/> <TextBox Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding ApiKey, Mode=TwoWay}" PasswordChar="*"/>
<TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.AnalyzeDiffPrompt}"/> <TextBlock Margin="0,12,0,0" Text="{DynamicResource Text.Preferences.AI.AnalyzeDiffPrompt}"/>
<TextBox Height="120" <TextBox Height="120"
Margin="0,4,0,0" Margin="0,4,0,0"
CornerRadius="3" CornerRadius="3"

View file

@ -76,8 +76,8 @@
<TextBlock Text="{Binding Name}" VerticalAlignment="Center"/> <TextBlock Text="{Binding Name}" VerticalAlignment="Center"/>
<Border Height="14" <Border Height="14"
CornerRadius="7" CornerRadius="7"
Margin="4,0,0,0" Padding="6,0" Margin="4,0,0,0" Padding="6,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Green" Background="Green"
IsVisible="{Binding Head, Converter={x:Static StringConverters.IsNullOrEmpty}}"> IsVisible="{Binding Head, Converter={x:Static StringConverters.IsNullOrEmpty}}">
<TextBlock Text="NEW" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/> <TextBlock Text="NEW" FontSize="9" FontFamily="{DynamicResource Fonts.Monospace}" Foreground="White" VerticalAlignment="Center"/>

View file

@ -65,7 +65,7 @@
CornerRadius="3" CornerRadius="3"
Watermark="{DynamicResource Text.Configure.Email.Placeholder}" Watermark="{DynamicResource Text.Configure.Email.Placeholder}"
Text="{Binding UserEmail, Mode=TwoWay}"/> Text="{Binding UserEmail, Mode=TwoWay}"/>
<TextBlock Grid.Row="2" Grid.Column="0" <TextBlock Grid.Row="2" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center" HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0" Margin="0,0,8,0"
@ -244,9 +244,9 @@
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
Background="{DynamicResource Brush.Contents}"> Background="{DynamicResource Brush.Contents}">
<Grid RowDefinitions="*,1,Auto"> <Grid RowDefinitions="*,1,Auto">
<ListBox Grid.Row="0" <ListBox Grid.Row="0"
Background="Transparent" Background="Transparent"
ItemsSource="{Binding IssueTrackerRules}" ItemsSource="{Binding IssueTrackerRules}"
SelectedItem="{Binding SelectedIssueTrackerRule, Mode=TwoWay}" SelectedItem="{Binding SelectedIssueTrackerRule, Mode=TwoWay}"
SelectionMode="Single"> SelectionMode="Single">
<ListBox.Styles> <ListBox.Styles>
@ -256,7 +256,7 @@
<Setter Property="Padding" Value="4,2"/> <Setter Property="Padding" Value="4,2"/>
</Style> </Style>
</ListBox.Styles> </ListBox.Styles>
<ListBox.ItemsPanel> <ListBox.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Orientation="Vertical"/> <StackPanel Orientation="Vertical"/>
@ -315,7 +315,7 @@
</Binding.TargetNullValue> </Binding.TargetNullValue>
</Binding> </Binding>
</ContentControl.Content> </ContentControl.Content>
<ContentControl.DataTemplates> <ContentControl.DataTemplates>
<DataTemplate DataType="m:IssueTrackerRule"> <DataTemplate DataType="m:IssueTrackerRule">
<Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto"> <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto">
@ -442,7 +442,7 @@
</ContentControl> </ContentControl>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Configure.OpenAI}"/> <TextBlock Classes="tab_header" Text="{DynamicResource Text.Configure.OpenAI}"/>

View file

@ -8,128 +8,128 @@
x:Class="SourceGit.Views.RepositoryToolbar" x:Class="SourceGit.Views.RepositoryToolbar"
x:DataType="vm:Repository"> x:DataType="vm:Repository">
<Grid ColumnDefinitions="*,Auto,*"> <Grid ColumnDefinitions="*,Auto,*">
<StackPanel Grid.Column="0" Orientation="Horizontal" Margin="4,0,0,0"> <StackPanel Grid.Column="0" Orientation="Horizontal" Margin="4,0,0,0">
<Button Classes="icon_button" Width="32" Command="{Binding OpenInFileManager}" ToolTip.Tip="{DynamicResource Text.Repository.Explore}"> <Button Classes="icon_button" Width="32" Command="{Binding OpenInFileManager}" ToolTip.Tip="{DynamicResource Text.Repository.Explore}">
<Path Width="14" Height="14" Data="{StaticResource Icons.Explore}" Margin="0,2,0,0"/> <Path Width="14" Height="14" Data="{StaticResource Icons.Explore}" Margin="0,2,0,0"/>
</Button> </Button>
<Button Classes="icon_button" Width="32" Click="OpenWithExternalTools" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Repository.OpenWithExternalTools}"> <Button Classes="icon_button" Width="32" Click="OpenWithExternalTools" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Repository.OpenWithExternalTools}">
<Path Width="13" Height="13" Data="{StaticResource Icons.OpenWith}"/> <Path Width="13" Height="13" Data="{StaticResource Icons.OpenWith}"/>
</Button> </Button>
<Button Classes="icon_button" Width="32" Command="{Binding OpenInTerminal}" ToolTip.Tip="{DynamicResource Text.Repository.Terminal}">
<Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
</Button>
<Button Classes="icon_button" Width="32" Click="OpenStatistics" ToolTip.Tip="{DynamicResource Text.Repository.Statistics}"> <Button Classes="icon_button" Width="32" Command="{Binding OpenInTerminal}" ToolTip.Tip="{DynamicResource Text.Repository.Terminal}">
<Path Width="13" Height="13" Data="{StaticResource Icons.Statistics}"/> <Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
</Button> </Button>
<Button Classes="icon_button" Width="32" Click="OpenConfigure" ToolTip.Tip="{DynamicResource Text.Repository.Configure}"> <Button Classes="icon_button" Width="32" Click="OpenStatistics" ToolTip.Tip="{DynamicResource Text.Repository.Statistics}">
<Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/> <Path Width="13" Height="13" Data="{StaticResource Icons.Statistics}"/>
</Button> </Button>
</StackPanel>
<StackPanel Grid.Column="1" Orientation="Horizontal"> <Button Classes="icon_button" Width="32" Click="OpenConfigure" ToolTip.Tip="{DynamicResource Text.Repository.Configure}">
<Button Classes="icon_button" Width="32" Click="Fetch" HotKey="{OnPlatform Ctrl+Down, macOS=⌘+Down}"> <Path Width="14" Height="14" Data="{StaticResource Icons.Settings}"/>
<ToolTip.Tip> </Button>
<StackPanel Orientation="Vertical"> </StackPanel>
<TextBlock Text="{DynamicResource Text.Fetch}"/>
<TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
</StackPanel>
</ToolTip.Tip>
<Path Width="14" Height="14" Data="{StaticResource Icons.Fetch}"/>
</Button>
<Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Pull" IsVisible="{Binding !IsBare}" IsEnabled="{Binding !IsBare}" HotKey="{OnPlatform Ctrl+Shift+Down, macOS=⌘+Shift+Down}"> <StackPanel Grid.Column="1" Orientation="Horizontal">
<ToolTip.Tip> <Button Classes="icon_button" Width="32" Click="Fetch" HotKey="{OnPlatform Ctrl+Down, macOS=⌘+Down}">
<StackPanel Orientation="Vertical"> <ToolTip.Tip>
<TextBlock Text="{DynamicResource Text.Pull}"/> <StackPanel Orientation="Vertical">
<TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/> <TextBlock Text="{DynamicResource Text.Fetch}"/>
</StackPanel> <TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
</ToolTip.Tip> </StackPanel>
</ToolTip.Tip>
<Path Width="14" Height="14" Data="{StaticResource Icons.Pull}"/>
</Button>
<Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Push" HotKey="{OnPlatform Ctrl+Shift+Up, macOS=⌘+Shift+Up}"> <Path Width="14" Height="14" Data="{StaticResource Icons.Fetch}"/>
<ToolTip.Tip> </Button>
<StackPanel Orientation="Vertical">
<TextBlock Text="{DynamicResource Text.Push}"/>
<TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
</StackPanel>
</ToolTip.Tip>
<Path Width="14" Height="14" Data="{StaticResource Icons.Push}"/>
</Button>
<Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="StashAll" IsVisible="{Binding !IsBare}"> <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Pull" IsVisible="{Binding !IsBare}" IsEnabled="{Binding !IsBare}" HotKey="{OnPlatform Ctrl+Shift+Down, macOS=⌘+Shift+Down}">
<ToolTip.Tip> <ToolTip.Tip>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock Text="{DynamicResource Text.Stash}"/> <TextBlock Text="{DynamicResource Text.Pull}"/>
<TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/> <TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
</StackPanel> </StackPanel>
</ToolTip.Tip> </ToolTip.Tip>
<Path Width="14" Height="14" Data="{StaticResource Icons.Stashes.Add}"/>
</Button>
<Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding ApplyPatch}" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Apply}"> <Path Width="14" Height="14" Data="{StaticResource Icons.Pull}"/>
<Path Width="14" Height="14" Data="{StaticResource Icons.Diff}"/> </Button>
</Button>
<Rectangle Width="1" Height="16" <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="Push" HotKey="{OnPlatform Ctrl+Shift+Up, macOS=⌘+Shift+Up}">
Margin="16,0,0,0" <ToolTip.Tip>
VerticalAlignment="Center" <StackPanel Orientation="Vertical">
Fill="{DynamicResource Brush.Border2}"/> <TextBlock Text="{DynamicResource Text.Push}"/>
<TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
</StackPanel>
</ToolTip.Tip>
<Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding CreateNewBranch}" ToolTip.Tip="{DynamicResource Text.Repository.NewBranch}"> <Path Width="14" Height="14" Data="{StaticResource Icons.Push}"/>
<Path Width="14" Height="14" Data="{StaticResource Icons.Branch.Add}"/> </Button>
</Button>
<Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitFlowMenu" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.GitFlow}"> <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Click="StashAll" IsVisible="{Binding !IsBare}">
<Path Width="14" Height="14" Data="{StaticResource Icons.GitFlow}"/> <ToolTip.Tip>
</Button> <StackPanel Orientation="Vertical">
<TextBlock Text="{DynamicResource Text.Stash}"/>
<TextBlock Classes="small italic" Margin="0,4,0,0" Text="{DynamicResource Text.CtrlClickTip}" Foreground="{DynamicResource Brush.FG2}"/>
</StackPanel>
</ToolTip.Tip>
<Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitLFSMenu" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.GitLFS}"> <Path Width="14" Height="14" Data="{StaticResource Icons.Stashes.Add}"/>
<Path Width="14" Height="14" Data="{StaticResource Icons.LFS}"/> </Button>
</Button>
<Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenCustomActionMenu" ToolTip.Tip="{DynamicResource Text.Repository.CustomActions}"> <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding ApplyPatch}" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.Apply}">
<Path Width="14" Height="14" Data="{StaticResource Icons.Action}"/> <Path Width="14" Height="14" Data="{StaticResource Icons.Diff}"/>
</Button> </Button>
<Button Classes="icon_button" Width="32" Margin="8,0,0,0" Command="{Binding Cleanup}" ToolTip.Tip="{DynamicResource Text.Repository.Clean}"> <Rectangle Width="1" Height="16"
<Path Width="14" Height="14" Margin="0,1,0,0" Data="{StaticResource Icons.Clean}"/> Margin="16,0,0,0"
</Button> VerticalAlignment="Center"
</StackPanel> Fill="{DynamicResource Brush.Border2}"/>
<StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0"> <Button Classes="icon_button" Width="32" Margin="16,0,0,0" Command="{Binding CreateNewBranch}" ToolTip.Tip="{DynamicResource Text.Repository.NewBranch}">
<Path Width="13" Height="13" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/> <Path Width="14" Height="14" Data="{StaticResource Icons.Branch.Add}"/>
</Button>
<ContentControl Margin="6,0,0,0"> <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitFlowMenu" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.GitFlow}">
<ContentControl.Content> <Path Width="14" Height="14" Data="{StaticResource Icons.GitFlow}"/>
<Binding Path="CurrentBranch"> </Button>
<Binding.TargetNullValue>
<TextBlock Classes="primary" Text="--"/>
</Binding.TargetNullValue>
</Binding>
</ContentControl.Content>
<ContentControl.DataTemplates> <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenGitLFSMenu" IsVisible="{Binding !IsBare}" ToolTip.Tip="{DynamicResource Text.GitLFS}">
<DataTemplate DataType="m:Branch"> <Path Width="14" Height="14" Data="{StaticResource Icons.LFS}"/>
<Border Background="Transparent" ToolTip.Tip="{Binding FriendlyName}"> </Button>
<TextBlock Classes="primary" Text="{Binding FriendlyName}" MaxWidth="250" TextTrimming="CharacterEllipsis"/>
</Border>
</DataTemplate>
</ContentControl.DataTemplates>
</ContentControl>
<Button Classes="icon_button" Width="32" Command="{Binding NavigateToCurrentHead}" ToolTip.Tip="{DynamicResource Text.Repository.NavigateToCurrentHead}"> <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Click="OpenCustomActionMenu" ToolTip.Tip="{DynamicResource Text.Repository.CustomActions}">
<Path Width="13" Height="13" Margin="0,2,0,0" Data="{StaticResource Icons.Target}" Fill="{DynamicResource Brush.FG1}"/> <Path Width="14" Height="14" Data="{StaticResource Icons.Action}"/>
</Button> </Button>
</StackPanel>
</Grid> <Button Classes="icon_button" Width="32" Margin="8,0,0,0" Command="{Binding Cleanup}" ToolTip.Tip="{DynamicResource Text.Repository.Clean}">
<Path Width="14" Height="14" Margin="0,1,0,0" Data="{StaticResource Icons.Clean}"/>
</Button>
</StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0">
<Path Width="13" Height="13" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Branch}"/>
<ContentControl Margin="6,0,0,0">
<ContentControl.Content>
<Binding Path="CurrentBranch">
<Binding.TargetNullValue>
<TextBlock Classes="primary" Text="--"/>
</Binding.TargetNullValue>
</Binding>
</ContentControl.Content>
<ContentControl.DataTemplates>
<DataTemplate DataType="m:Branch">
<Border Background="Transparent" ToolTip.Tip="{Binding FriendlyName}">
<TextBlock Classes="primary" Text="{Binding FriendlyName}" MaxWidth="250" TextTrimming="CharacterEllipsis"/>
</Border>
</DataTemplate>
</ContentControl.DataTemplates>
</ContentControl>
<Button Classes="icon_button" Width="32" Command="{Binding NavigateToCurrentHead}" ToolTip.Tip="{DynamicResource Text.Repository.NavigateToCurrentHead}">
<Path Width="13" Height="13" Margin="0,2,0,0" Data="{StaticResource Icons.Target}" Fill="{DynamicResource Brush.FG1}"/>
</Button>
</StackPanel>
</Grid>
</UserControl> </UserControl>

View file

@ -15,7 +15,7 @@
<TextBlock Text="{DynamicResource Text.Worktree}" Classes="primary" Margin="4,2" Foreground="#FFDDDDDD"/> <TextBlock Text="{DynamicResource Text.Worktree}" Classes="primary" Margin="4,2" Foreground="#FFDDDDDD"/>
</Border> </Border>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="m:Commit"> <DataTemplate DataType="m:Commit">
<Grid RowDefinitions="Auto,*"> <Grid RowDefinitions="Auto,*">
<Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto"> <Grid Grid.Row="0" ColumnDefinitions="Auto,*,Auto,Auto,Auto">
@ -32,7 +32,7 @@
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</UserControl.DataTemplates> </UserControl.DataTemplates>
<Grid RowDefinitions="50,*" Margin="4"> <Grid RowDefinitions="50,*" Margin="4">
<!-- Compare Revision Info --> <!-- Compare Revision Info -->
<Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto"> <Grid Grid.Row="0" Margin="0,0,0,6" ColumnDefinitions="*,32,*,Auto">

View file

@ -35,12 +35,12 @@
</Border> </Border>
</Border> </Border>
</Border> </Border>
<StackPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center"> <StackPanel Grid.Row="1" Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center">
<Border Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center"> <Border Height="16" Background="Green" CornerRadius="8" VerticalAlignment="Center">
<TextBlock Classes="primary" Text="{Binding ImageType}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/> <TextBlock Classes="primary" Text="{Binding ImageType}" Margin="8,0" FontSize="10" Foreground="{DynamicResource Brush.BadgeFG}"/>
</Border> </Border>
<TextBlock Classes="primary" Text="{Binding ImageSize}" Margin="8,0,0,0"/> <TextBlock Classes="primary" Text="{Binding ImageSize}" Margin="8,0,0,0"/>
<TextBlock Classes="primary" Text="{Binding FileSize}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/> <TextBlock Classes="primary" Text="{Binding FileSize}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
<TextBlock Classes="primary" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" Margin="2,0,0,0"/> <TextBlock Classes="primary" Text="{DynamicResource Text.Bytes}" Foreground="{DynamicResource Brush.FG2}" Margin="2,0,0,0"/>

View file

@ -50,7 +50,7 @@
<Binding Path="$parent[Window].IsActive"/> <Binding Path="$parent[Window].IsActive"/>
</MultiBinding> </MultiBinding>
</Popup.IsOpen> </Popup.IsOpen>
<Border Margin="8" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #80000000)"> <Border Margin="8" VerticalAlignment="Top" Effect="drop-shadow(0 0 8 #80000000)">
<Border Background="{DynamicResource Brush.Popup}" CornerRadius="4" Padding="4" BorderThickness="0.65" BorderBrush="{DynamicResource Brush.Accent}"> <Border Background="{DynamicResource Brush.Popup}" CornerRadius="4" Padding="4" BorderThickness="0.65" BorderBrush="{DynamicResource Brush.Accent}">
<ListBox x:Name="SearchSuggestionBox" <ListBox x:Name="SearchSuggestionBox"

View file

@ -17,9 +17,9 @@
<Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/> <Path Margin="0,0,8,0" Width="14" Height="14" Fill="{DynamicResource Brush.FG1}" Data="{StaticResource Icons.Commit}"/>
<TextBlock Classes="primary" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/> <TextBlock Classes="primary" Text="{Binding Head.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange"/>
</StackPanel> </StackPanel>
<v:CommitMessageTextBox Height="120" Margin="8,5,8,0" Text="{Binding Message, Mode=TwoWay}"/> <v:CommitMessageTextBox Height="120" Margin="8,5,8,0" Text="{Binding Message, Mode=TwoWay}"/>
<TextBlock Margin="8" <TextBlock Margin="8"
Text="{DynamicResource Text.Reword.Tip}" Text="{DynamicResource Text.Reword.Tip}"
TextWrapping="Wrap" TextWrapping="Wrap"

View file

@ -112,7 +112,7 @@
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,8"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,8">
<Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green"/> <Path Width="14" Height="14" Data="{StaticResource Icons.Info}" Fill="Green"/>
<TextBlock Margin="8,0,0,0" Text="{DynamicResource Text.SelfUpdate.UpToDate}"/> <TextBlock Margin="8,0,0,0" Text="{DynamicResource Text.SelfUpdate.UpToDate}"/>
</StackPanel> </StackPanel>
<Button Classes="flat primary" <Button Classes="flat primary"
Height="30" Height="30"

View file

@ -12,13 +12,13 @@
Classes="bold" Classes="bold"
Text="{DynamicResource Text.Stash.Title}"/> Text="{DynamicResource Text.Stash.Title}"/>
<Grid Margin="8,16,0,0" RowDefinitions="32,Auto,Auto,32,Auto,Auto" ColumnDefinitions="120,*"> <Grid Margin="8,16,0,0" RowDefinitions="32,Auto,Auto,32,Auto,Auto" ColumnDefinitions="120,*">
<TextBlock Grid.Row="0" Grid.Column="0" <TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Margin="8,0" Margin="8,0"
Text="{DynamicResource Text.Stash.Message}"/> Text="{DynamicResource Text.Stash.Message}"/>
<TextBox Grid.Row="0" Grid.Column="1" <TextBox Grid.Row="0" Grid.Column="1"
Height="26" Height="26"
CornerRadius="3" CornerRadius="3"
Text="{Binding Message, Mode=TwoWay}" Text="{Binding Message, Mode=TwoWay}"
Watermark="{DynamicResource Text.Stash.Message.Placeholder}" Watermark="{DynamicResource Text.Stash.Message.Placeholder}"
v:AutoFocusBehaviour.IsEnabled="True"/> v:AutoFocusBehaviour.IsEnabled="True"/>

View file

@ -17,7 +17,7 @@
<Setter Property="IsNoneVisible" Value="True"/> <Setter Property="IsNoneVisible" Value="True"/>
</Style> </Style>
</UserControl.Styles> </UserControl.Styles>
<UserControl.DataTemplates> <UserControl.DataTemplates>
<DataTemplate DataType="vm:TagCollectionAsTree"> <DataTemplate DataType="vm:TagCollectionAsTree">
<ListBox Classes="repo_left_content_list" <ListBox Classes="repo_left_content_list"
@ -38,14 +38,14 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
IsChecked="{Binding IsExpanded, Mode=OneWay}" IsChecked="{Binding IsExpanded, Mode=OneWay}"
IsVisible="{Binding IsFolder}"/> IsVisible="{Binding IsFolder}"/>
<v:TagTreeNodeIcon Grid.Column="1" <v:TagTreeNodeIcon Grid.Column="1"
Node="{Binding .}" Node="{Binding .}"
IsExpanded="{Binding IsExpanded, Mode=OneWay}"/> IsExpanded="{Binding IsExpanded, Mode=OneWay}"/>
<TextBlock Grid.Column="2" <TextBlock Grid.Column="2"
Classes="primary" Classes="primary"
Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}" Text="{Binding FullPath, Converter={x:Static c:PathConverters.PureFileName}}"
Margin="8,0,0,0"/> Margin="8,0,0,0"/>
<ContentControl Grid.Column="3" Content="{Binding Tag}"> <ContentControl Grid.Column="3" Content="{Binding Tag}">
@ -65,7 +65,7 @@
<ListBox Classes="repo_left_content_list" <ListBox Classes="repo_left_content_list"
Margin="8,0,0,0" Margin="8,0,0,0"
ItemsSource="{Binding Tags}" ItemsSource="{Binding Tags}"
SelectionMode="Single" SelectionMode="Single"
SelectionChanged="OnRowSelectionChanged"> SelectionChanged="OnRowSelectionChanged">
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate DataType="m:Tag"> <DataTemplate DataType="m:Tag">
@ -73,17 +73,17 @@
Background="Transparent" Background="Transparent"
ContextRequested="OnRowContextRequested" ContextRequested="OnRowContextRequested"
ToolTip.Tip="{Binding Message}"> ToolTip.Tip="{Binding Message}">
<Path Grid.Column="0" <Path Grid.Column="0"
Margin="8,0,0,0" Margin="8,0,0,0"
Width="12" Height="12" Width="12" Height="12"
Data="{StaticResource Icons.Tag}"/> Data="{StaticResource Icons.Tag}"/>
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
Classes="primary" Classes="primary"
Text="{Binding Name}" Text="{Binding Name}"
Margin="8,0,0,0" Margin="8,0,0,0"
TextTrimming="CharacterEllipsis"/> TextTrimming="CharacterEllipsis"/>
<v:FilterModeSwitchButton Grid.Column="2" Margin="0,0,12,0" Mode="{Binding FilterMode}"/> <v:FilterModeSwitchButton Grid.Column="2" Margin="0,0,12,0" Mode="{Binding FilterMode}"/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>

View file

@ -14,7 +14,7 @@
<ContentControl.DataTemplates> <ContentControl.DataTemplates>
<DataTemplate DataType="m:TextDiff"> <DataTemplate DataType="m:TextDiff">
<Grid ColumnDefinitions="*,1,8"> <Grid ColumnDefinitions="*,1,8">
<v:CombinedTextDiffPresenter Grid.Column="0" <v:CombinedTextDiffPresenter Grid.Column="0"
x:Name="CombinedPresenter" x:Name="CombinedPresenter"
FileName="{Binding File}" FileName="{Binding File}"
Foreground="{DynamicResource Brush.FG1}" Foreground="{DynamicResource Brush.FG1}"
@ -34,7 +34,7 @@
EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}" EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}" SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"
BlockNavigation="{Binding #ThisControl.BlockNavigation, Mode=TwoWay}"/> BlockNavigation="{Binding #ThisControl.BlockNavigation, Mode=TwoWay}"/>
<Rectangle Grid.Column="1" Fill="{DynamicResource Brush.Border2}" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch"/> <Rectangle Grid.Column="1" Fill="{DynamicResource Brush.Border2}" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch"/>
<v:TextDiffViewMinimap Grid.Column="2" <v:TextDiffViewMinimap Grid.Column="2"
@ -90,7 +90,7 @@
EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}" EnableChunkSelection="{Binding #ThisControl.EnableChunkSelection}"
SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}" SelectedChunk="{Binding #ThisControl.SelectedChunk, Mode=TwoWay}"
BlockNavigation="{Binding #ThisControl.BlockNavigation, Mode=TwoWay}"/> BlockNavigation="{Binding #ThisControl.BlockNavigation, Mode=TwoWay}"/>
<Rectangle Grid.Column="3" Fill="{DynamicResource Brush.Border2}" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch"/> <Rectangle Grid.Column="3" Fill="{DynamicResource Brush.Border2}" Width="1" HorizontalAlignment="Center" VerticalAlignment="Stretch"/>
<v:TextDiffViewMinimap Grid.Column="4" <v:TextDiffViewMinimap Grid.Column="4"
@ -110,7 +110,7 @@
<Run Foreground="{DynamicResource Brush.FG2}" FontWeight="Normal" Text="{OnPlatform Ctrl+S, macOS=⌘+S}"/> <Run Foreground="{DynamicResource Brush.FG2}" FontWeight="Normal" Text="{OnPlatform Ctrl+S, macOS=⌘+S}"/>
</TextBlock> </TextBlock>
</Button> </Button>
<Button Classes="flat" Click="OnUnstageChunk" HotKey="{OnPlatform Ctrl+U, macOS=⌘+U}" IsVisible="{Binding #ThisControl.IsUnstagedChange, Converter={x:Static BoolConverters.Not}}"> <Button Classes="flat" Click="OnUnstageChunk" HotKey="{OnPlatform Ctrl+U, macOS=⌘+U}" IsVisible="{Binding #ThisControl.IsUnstagedChange, Converter={x:Static BoolConverters.Not}}">
<TextBlock> <TextBlock>
<Run Text="{DynamicResource Text.Hunk.Unstage}"/> <Run Text="{DynamicResource Text.Hunk.Unstage}"/>
@ -118,7 +118,7 @@
<Run Foreground="{DynamicResource Brush.FG2}" FontWeight="Normal" Text="{OnPlatform Ctrl+U, macOS=⌘+U}"/> <Run Foreground="{DynamicResource Brush.FG2}" FontWeight="Normal" Text="{OnPlatform Ctrl+U, macOS=⌘+U}"/>
</TextBlock> </TextBlock>
</Button> </Button>
<Button Classes="flat" Margin="8,0,0,0" HotKey="{OnPlatform Ctrl+D, macOS=⌘+D}" Click="OnDiscardChunk" IsVisible="{Binding #ThisControl.IsUnstagedChange}"> <Button Classes="flat" Margin="8,0,0,0" HotKey="{OnPlatform Ctrl+D, macOS=⌘+D}" Click="OnDiscardChunk" IsVisible="{Binding #ThisControl.IsUnstagedChange}">
<TextBlock> <TextBlock>
<Run Text="{DynamicResource Text.Hunk.Discard}"/> <Run Text="{DynamicResource Text.Hunk.Discard}"/>

View file

@ -18,14 +18,14 @@
<Button Classes="icon_button" Width="32" Command="{Binding OpenTerminal}" ToolTip.Tip="{DynamicResource Text.Welcome.OpenTerminal}"> <Button Classes="icon_button" Width="32" Command="{Binding OpenTerminal}" ToolTip.Tip="{DynamicResource Text.Welcome.OpenTerminal}">
<Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/> <Path Width="13" Height="13" Data="{StaticResource Icons.Terminal}"/>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal"> <StackPanel Grid.Column="2" Orientation="Horizontal">
<Button Classes="icon_button" Width="32" Command="{Binding AddRootNode}" ToolTip.Tip="{DynamicResource Text.Welcome.AddRootFolder}"> <Button Classes="icon_button" Width="32" Command="{Binding AddRootNode}" ToolTip.Tip="{DynamicResource Text.Welcome.AddRootFolder}">
<Path Width="14" Height="14" Margin="0,2,0,0" Data="{StaticResource Icons.Folder.Add}"/> <Path Width="14" Height="14" Margin="0,2,0,0" Data="{StaticResource Icons.Folder.Add}"/>
</Button> </Button>
<Button Classes="icon_button" Width="32" Command="{Binding ScanDefaultCloneDir}" ToolTip.Tip="{DynamicResource Text.Welcome.ScanDefaultCloneDir}"> <Button Classes="icon_button" Width="32" Command="{Binding ScanDefaultCloneDir}" ToolTip.Tip="{DynamicResource Text.Welcome.ScanDefaultCloneDir}">
<Path Width="14" Height="14" Data="{StaticResource Icons.Scan}"/> <Path Width="14" Height="14" Data="{StaticResource Icons.Scan}"/>
</Button> </Button>

View file

@ -23,7 +23,7 @@
<RowDefinition Height="1"/> <RowDefinition Height="1"/>
<RowDefinition Height="*" MinHeight="100"/> <RowDefinition Height="*" MinHeight="100"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- Unstaged --> <!-- Unstaged -->
<Grid Grid.Row="0" RowDefinitions="28,36,*"> <Grid Grid.Row="0" RowDefinitions="28,36,*">
<!-- Unstaged Toolbar --> <!-- Unstaged Toolbar -->
@ -106,7 +106,7 @@
</TextBox.InnerRightContent> </TextBox.InnerRightContent>
</TextBox> </TextBox>
</Border> </Border>
<!-- Unstaged Changes --> <!-- Unstaged Changes -->
<v:ChangeCollectionView Grid.Row="2" <v:ChangeCollectionView Grid.Row="2"
x:Name="UnstagedChangesView" x:Name="UnstagedChangesView"
@ -121,7 +121,7 @@
ChangeDoubleTapped="OnUnstagedChangeDoubleTapped" ChangeDoubleTapped="OnUnstagedChangeDoubleTapped"
KeyDown="OnUnstagedKeyDown"/> KeyDown="OnUnstagedKeyDown"/>
</Grid> </Grid>
<!-- Splitter --> <!-- Splitter -->
<GridSplitter Grid.Row="1" <GridSplitter Grid.Row="1"
MinHeight="1" MinHeight="1"
@ -129,7 +129,7 @@
Background="{DynamicResource Brush.Border0}"/> Background="{DynamicResource Brush.Border0}"/>
<!-- Staged --> <!-- Staged -->
<Grid Grid.Row="2" RowDefinitions="28,*"> <Grid Grid.Row="2" RowDefinitions="28,*">
<!-- Staged Toolbar --> <!-- Staged Toolbar -->
<Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"> <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
<Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto"> <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto">
@ -186,7 +186,7 @@
<RowDefinition Height="128" MinHeight="100"/> <RowDefinition Height="128" MinHeight="100"/>
<RowDefinition Height="36"/> <RowDefinition Height="36"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<!-- Select Change Detail --> <!-- Select Change Detail -->
<Grid Grid.Row="0"> <Grid Grid.Row="0">
<Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"> <Border BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
@ -277,7 +277,7 @@
Width="18" Height="18" Width="18" Height="18"
HorizontalAlignment="Right" HorizontalAlignment="Right"
IsVisible="{Binding IsCommitting}"/> IsVisible="{Binding IsCommitting}"/>
<SplitButton Grid.Column="6" <SplitButton Grid.Column="6"
Content="{DynamicResource Text.Repository.Continue}" Content="{DynamicResource Text.Repository.Continue}"
Height="28" Height="28"
@ -323,7 +323,7 @@
</StackPanel> </StackPanel>
</ToolTip.Tip> </ToolTip.Tip>
</Button> </Button>
<!-- Invisible button just to add another hotkey `Ctrl+Shift+Enter` to commit with auto-stage --> <!-- Invisible button just to add another hotkey `Ctrl+Shift+Enter` to commit with auto-stage -->
<Button Grid.Column="7" <Button Grid.Column="7"
Width="0" Height="0" Width="0" Height="0"
@ -350,7 +350,7 @@
<Binding Path="UseAmend" Converter="{x:Static BoolConverters.Not}"/> <Binding Path="UseAmend" Converter="{x:Static BoolConverters.Not}"/>
<Binding Path="InProgressContext" Converter="{x:Static ObjectConverters.IsNull}"/> <Binding Path="InProgressContext" Converter="{x:Static ObjectConverters.IsNull}"/>
</MultiBinding> </MultiBinding>
</Button.IsVisible> </Button.IsVisible>
</Button> </Button>
</Grid> </Grid>
</Grid> </Grid>