dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-06-21 02:15:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

code_style: whitespace cleanup

Browse source
This commit is contained in:
Nathan Baulch 2025-06-12 09:19:34 +10:00
parent dde08c507a
commit f4572c640b
44 changed files with 65 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.editorconfig
View file

@ -100,7 +100,7 @@ dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
dotnet_naming_style.camel_case_underscore_style.required_prefix = _ dotnet_naming_style.camel_case_underscore_style.required_prefix = _
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
# use accessibility modifiers # use accessibility modifiers
dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion

1
src/Models/TextInlineChange.cs
View file

@ -204,7 +204,6 @@ namespace SourceGit.Models
for (int i = 0; i <= half; i++) for (int i = 0; i <= half; i++)
{ {
for (int j = -i; j <= i; j += 2) for (int j = -i; j <= i; j += 2)
{ {
var idx = j + half; var idx = j + half;

34
src/Resources/Styles.axaml
View file

@ -16,7 +16,7 @@
<Style.Resources> <Style.Resources>
<x:Double x:Key="ScrollBarSize">12</x:Double> <x:Double x:Key="ScrollBarSize">12</x:Double>
</Style.Resources> </Style.Resources>
<Setter Property="ShowDelay" Value="0:0:0.1"/> <Setter Property="ShowDelay" Value="0:0:0.1"/>
<Setter Property="HideDelay" Value="0:0:0.2"/> <Setter Property="HideDelay" Value="0:0:0.2"/>
</Style> </Style>
@ -38,7 +38,7 @@
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
<Setter Property="Padding" Value="0"/> <Setter Property="Padding" Value="0"/>
</Style> </Style>
<Style Selector="Window[WindowState=Maximized].fix_maximized_padding"> <Style Selector="Window[WindowState=Maximized].fix_maximized_padding">
<Setter Property="Padding" Value="8,6,8,8"/> <Setter Property="Padding" Value="8,6,8,8"/>
</Style> </Style>
@ -206,7 +206,7 @@
<DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6"/> <DropShadowEffect OffsetX="0" OffsetY="0" BlurRadius="4" Color="Black" Opacity=".6"/>
</Border.Effect> </Border.Effect>
</Border> </Border>
<Border Name="LayoutRoot" <Border Name="LayoutRoot"
Margin="4" Margin="4"
Padding="12" Padding="12"
@ -318,7 +318,7 @@
<Setter Property="Foreground" Value="DarkOrange"/> <Setter Property="Foreground" Value="DarkOrange"/>
<Setter Property="TextDecorations" Value="Underline"/> <Setter Property="TextDecorations" Value="Underline"/>
</Style> </Style>
<Style Selector="SelectableTextBlock"> <Style Selector="SelectableTextBlock">
<Setter Property="HorizontalAlignment" Value="Left"/> <Setter Property="HorizontalAlignment" Value="Left"/>
<Setter Property="VerticalAlignment" Value="Center"/> <Setter Property="VerticalAlignment" Value="Center"/>
@ -336,7 +336,7 @@
<Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/> <Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/>
</MenuItem.Icon> </MenuItem.Icon>
</MenuItem> </MenuItem>
<MenuItem Header="{DynamicResource Text.CopyAllText}" <MenuItem Header="{DynamicResource Text.CopyAllText}"
Command="{x:Static s:App.CopyTextBlockCommand}" Command="{x:Static s:App.CopyTextBlockCommand}"
CommandParameter="{Binding $parent[SelectableTextBlock]}"> CommandParameter="{Binding $parent[SelectableTextBlock]}">
@ -524,7 +524,7 @@
<Style Selector="Button.flat.primary ToolTip TextBlock"> <Style Selector="Button.flat.primary ToolTip TextBlock">
<Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/> <Setter Property="Foreground" Value="{DynamicResource Brush.FG1}"/>
</Style> </Style>
<Style Selector="SplitButton"> <Style Selector="SplitButton">
<Setter Property="MinHeight" Value="24"/> <Setter Property="MinHeight" Value="24"/>
<Setter Property="Template"> <Setter Property="Template">
@ -569,17 +569,17 @@
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:disabled /template/ Button"> <Style Selector="^:disabled /template/ Button">
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
<Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}"/> <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}"/>
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
</Style> </Style>
<Style Selector="^:disabled TextBlock"> <Style Selector="^:disabled TextBlock">
<Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/> <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/>
</Style> </Style>
<Style Selector="^:disabled Path"> <Style Selector="^:disabled Path">
<Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/> <Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/>
</Style> </Style>
@ -737,7 +737,7 @@
<Setter Property="Background" Value="{DynamicResource Brush.Accent}" /> <Setter Property="Background" Value="{DynamicResource Brush.Accent}" />
<Setter Property="Opacity" Value=".8"/> <Setter Property="Opacity" Value=".8"/>
</Style> </Style>
</Style> </Style>
<Style Selector="ContextMenu"> <Style Selector="ContextMenu">
<Setter Property="HorizontalOffset" Value="-4"/> <Setter Property="HorizontalOffset" Value="-4"/>
@ -849,7 +849,7 @@
</DataTemplate> </DataTemplate>
</ContentPresenter.DataTemplates> </ContentPresenter.DataTemplates>
</ContentPresenter> </ContentPresenter>
<TextBlock x:Name="PART_InputGestureText" <TextBlock x:Name="PART_InputGestureText"
Grid.Column="2" Grid.Column="2"
Classes="CaptionTextBlockStyle" Classes="CaptionTextBlockStyle"
@ -871,7 +871,7 @@
Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}" Foreground="{DynamicResource MenuFlyoutItemKeyboardAcceleratorTextForeground}"
FontSize="11" FontSize="11"
IsVisible="{TemplateBinding (v:MenuItemExtension.Command), Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/> IsVisible="{TemplateBinding (v:MenuItemExtension.Command), Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
<Path Name="PART_ChevronPath" <Path Name="PART_ChevronPath"
Width="6" Width="6"
Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z" Data="M573 512 215 881c-20 20-20 51 0 61l61 61c20 20 51 20 61 0l461-461c10-10 10-20 10-31s0-20-10-31L338 20C317 0 287 0 276 20L215 82c-20 20-20 51 0 61L573 512z"
@ -914,7 +914,7 @@
</Panel> </Panel>
</ControlTemplate> </ControlTemplate>
</Setter> </Setter>
<Style Selector="^:icon /template/ ContentControl#PART_IconPresenter"> <Style Selector="^:icon /template/ ContentControl#PART_IconPresenter">
<Setter Property="IsVisible" Value="True" /> <Setter Property="IsVisible" Value="True" />
</Style> </Style>
@ -956,7 +956,7 @@
<Style Selector="MenuItem.filter_mode_switcher"> <Style Selector="MenuItem.filter_mode_switcher">
<Setter Property="Height" Value="48"/> <Setter Property="Height" Value="48"/>
<Setter Property="StaysOpenOnClick" Value="True"/> <Setter Property="StaysOpenOnClick" Value="True"/>
<Style Selector="^:selected"> <Style Selector="^:selected">
<Style Selector="^ /template/ Border#PART_LayoutRoot"> <Style Selector="^ /template/ Border#PART_LayoutRoot">
<Setter Property="Background" Value="Transparent" /> <Setter Property="Background" Value="Transparent" />
@ -1179,7 +1179,7 @@
<Setter Property="Data" Value="M 0 4 L 8 4 L 4 8 Z" /> <Setter Property="Data" Value="M 0 4 L 8 4 L 4 8 Z" />
</Style> </Style>
</Style> </Style>
<Style Selector="ToggleButton.folder"> <Style Selector="ToggleButton.folder">
<Setter Property="Margin" Value="0" /> <Setter Property="Margin" Value="0" />
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
@ -1252,7 +1252,7 @@
<Style Selector="ToggleButton.toggle_untracked:pointerover /template/ Path#PART_IndicatorIcon"> <Style Selector="ToggleButton.toggle_untracked:pointerover /template/ Path#PART_IndicatorIcon">
<Setter Property="Opacity" Value="1"/> <Setter Property="Opacity" Value="1"/>
</Style> </Style>
<Style Selector="ToggleButton.show_as_tree"> <Style Selector="ToggleButton.show_as_tree">
<Setter Property="Margin" Value="0" /> <Setter Property="Margin" Value="0" />
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
@ -1284,7 +1284,7 @@
<Setter Property="Opacity" Value="1"/> <Setter Property="Opacity" Value="1"/>
</Style> </Style>
</Style> </Style>
<Style Selector="Slider"> <Style Selector="Slider">
<Style.Resources> <Style.Resources>
<Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness> <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>

2
src/Resources/Themes.axaml
View file

@ -55,7 +55,7 @@
<Color x:Key="Color.InlineCode">#FF383838</Color> <Color x:Key="Color.InlineCode">#FF383838</Color>
</ResourceDictionary> </ResourceDictionary>
</ResourceDictionary.ThemeDictionaries> </ResourceDictionary.ThemeDictionaries>
<SolidColorBrush x:Key="Brush.Window" Color="{DynamicResource Color.Window}"/> <SolidColorBrush x:Key="Brush.Window" Color="{DynamicResource Color.Window}"/>
<SolidColorBrush x:Key="Brush.WindowBorder" Color="{DynamicResource Color.WindowBorder}"/> <SolidColorBrush x:Key="Brush.WindowBorder" Color="{DynamicResource Color.WindowBorder}"/>
<SolidColorBrush x:Key="Brush.TitleBar" Color="{DynamicResource Color.TitleBar}"/> <SolidColorBrush x:Key="Brush.TitleBar" Color="{DynamicResource Color.TitleBar}"/>

4
src/ViewModels/Blame.cs
View file

@ -115,7 +115,7 @@ namespace SourceGit.ViewModels
break; break;
} }
} }
} }
} }
private void SetBlameData(string commitSHA) private void SetBlameData(string commitSHA)
@ -145,7 +145,7 @@ namespace SourceGit.ViewModels
} }
}); });
}, token); }, token);
} }
Task.Run(() => Task.Run(() =>
{ {

2
src/ViewModels/Histories.cs
View file

@ -244,7 +244,7 @@ namespace SourceGit.ViewModels
return; return;
} }
} }
if (firstRemoteBranch == null) if (firstRemoteBranch == null)
firstRemoteBranch = remoteBranch; firstRemoteBranch = remoteBranch;
} }

2
src/ViewModels/Repository.cs
View file

@ -1339,7 +1339,7 @@ namespace SourceGit.ViewModels
{ {
foreach (var b in _branches) foreach (var b in _branches)
{ {
if (b.IsLocal && if (b.IsLocal &&
b.Upstream.Equals(branch.FullName, StringComparison.Ordinal) && b.Upstream.Equals(branch.FullName, StringComparison.Ordinal) &&
b.TrackStatus.Ahead.Count == 0) b.TrackStatus.Ahead.Count == 0)
{ {

1
src/Views/About.axaml
View file

@ -62,7 +62,6 @@
</Button> </Button>
</StackPanel> </StackPanel>
<TextBlock x:Name="TxtCopyright" Margin="0,40,0,0" Foreground="{DynamicResource Brush.FG2}"/> <TextBlock x:Name="TxtCopyright" Margin="0,40,0,0" Foreground="{DynamicResource Brush.FG2}"/>
</StackPanel> </StackPanel>
</Grid> </Grid>

1
src/Views/ApplyStash.axaml.cs
View file

@ -10,4 +10,3 @@ namespace SourceGit.Views
} }
} }
} }

6
src/Views/Blame.axaml
View file

@ -48,7 +48,7 @@
<Path Grid.Column="0" <Path Grid.Column="0"
Width="14" Height="14" Width="14" Height="14"
Data="{StaticResource Icons.File}"/> Data="{StaticResource Icons.File}"/>
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
Margin="4,0,0,0" Margin="4,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -61,7 +61,7 @@
Command="{Binding Back}"> Command="{Binding Back}">
<Path Width="12" Height="12" Data="{StaticResource Icons.TriangleLeft}"/> <Path Width="12" Height="12" Data="{StaticResource Icons.TriangleLeft}"/>
</Button> </Button>
<Button Grid.Column="3" <Button Grid.Column="3"
Classes="icon_button" Classes="icon_button"
IsEnabled="{Binding CanForward}" IsEnabled="{Binding CanForward}"
@ -80,7 +80,7 @@
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
Text="{Binding Revision.Subject}" Text="{Binding Revision.Subject}"
TextTrimming="CharacterEllipsis"/> TextTrimming="CharacterEllipsis"/>
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
</Border> </Border>

1
src/Views/BranchTree.axaml
View file

@ -96,4 +96,3 @@
</ListBox.ItemTemplate> </ListBox.ItemTemplate>
</ListBox> </ListBox>
</UserControl> </UserControl>

5
src/Views/BranchTree.axaml.cs
View file

@ -479,12 +479,12 @@ namespace SourceGit.Views
if (branches.Find(x => x.IsCurrent) != null) if (branches.Find(x => x.IsCurrent) != null)
return; return;
if (branches.Count == 1) if (branches.Count == 1)
repo.DeleteBranch(branches[0]); repo.DeleteBranch(branches[0]);
else else
repo.DeleteMultipleBranches(branches, branches[0].IsLocal); repo.DeleteMultipleBranches(branches, branches[0].IsLocal);
e.Handled = true; e.Handled = true;
} }
@ -537,4 +537,3 @@ namespace SourceGit.Views
private bool _disableSelectionChangingEvent = false; private bool _disableSelectionChangingEvent = false;
} }
} }

6
src/Views/CommitBaseInfo.axaml
View file

@ -120,7 +120,7 @@
<Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/> <Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
</MultiBinding> </MultiBinding>
</ToolTip.IsOpen> </ToolTip.IsOpen>
<TextBlock.DataTemplates> <TextBlock.DataTemplates>
<DataTemplate DataType="m:Commit"> <DataTemplate DataType="m:Commit">
<StackPanel MinWidth="400" Orientation="Vertical"> <StackPanel MinWidth="400" Orientation="Vertical">
@ -165,7 +165,7 @@
<Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/> <Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
</MultiBinding> </MultiBinding>
</ToolTip.IsOpen> </ToolTip.IsOpen>
<TextBlock.DataTemplates> <TextBlock.DataTemplates>
<DataTemplate DataType="m:Commit"> <DataTemplate DataType="m:Commit">
<StackPanel MinWidth="400" Orientation="Vertical"> <StackPanel MinWidth="400" Orientation="Vertical">
@ -209,7 +209,7 @@
<Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/> <Binding Path="$self.(ToolTip.Tip)" Converter="{x:Static ObjectConverters.IsNotNull}"/>
</MultiBinding> </MultiBinding>
</ToolTip.IsOpen> </ToolTip.IsOpen>
<v:CommitMessagePresenter.DataTemplates> <v:CommitMessagePresenter.DataTemplates>
<DataTemplate DataType="m:Commit"> <DataTemplate DataType="m:Commit">
<StackPanel MinWidth="400" Orientation="Vertical"> <StackPanel MinWidth="400" Orientation="Vertical">

3
src/Views/CommitMessageTextBox.axaml
View file

@ -67,7 +67,7 @@
<Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*" Margin="0,4"> <Grid ColumnDefinitions="Auto,Auto,Auto,Auto,*" Margin="0,4">
<Button Grid.Column="0" <Button Grid.Column="0"
Classes="icon_button" Classes="icon_button"
Width="24" Width="24"
Margin="0,0,4,0" Padding="0" Margin="0,0,4,0" Padding="0"
Click="OnOpenCommitMessagePicker" Click="OnOpenCommitMessagePicker"
IsVisible="{Binding #ThisControl.ShowAdvancedOptions}" IsVisible="{Binding #ThisControl.ShowAdvancedOptions}"
@ -120,4 +120,3 @@
</Grid> </Grid>
</Border> </Border>
</UserControl> </UserControl>

6
src/Views/ConfigureWorkspace.axaml
View file

@ -121,7 +121,7 @@
<Grid RowDefinitions="30,32,30,32,30,Auto,32"> <Grid RowDefinitions="30,32,30,32,30,Auto,32">
<TextBlock Grid.Row="0" Margin="0,0,0,4" Text="{DynamicResource Text.ConfigureWorkspace.Name}" VerticalAlignment="Bottom"/> <TextBlock Grid.Row="0" Margin="0,0,0,4" Text="{DynamicResource Text.ConfigureWorkspace.Name}" VerticalAlignment="Bottom"/>
<TextBox Grid.Row="1" CornerRadius="3" Height="28" Text="{Binding Name, Mode=TwoWay}"/> <TextBox Grid.Row="1" CornerRadius="3" Height="28" Text="{Binding Name, Mode=TwoWay}"/>
<TextBlock Grid.Row="2" Margin="0,0,0,4" Text="{DynamicResource Text.Preferences.Git.DefaultCloneDir}" VerticalAlignment="Bottom"/> <TextBlock Grid.Row="2" Margin="0,0,0,4" Text="{DynamicResource Text.Preferences.Git.DefaultCloneDir}" VerticalAlignment="Bottom"/>
<TextBox Grid.Row="3" CornerRadius="3" Height="28" Text="{Binding DefaultCloneDir, Mode=TwoWay}"> <TextBox Grid.Row="3" CornerRadius="3" Height="28" Text="{Binding DefaultCloneDir, Mode=TwoWay}">
<TextBox.InnerRightContent> <TextBox.InnerRightContent>
@ -130,10 +130,10 @@
</Button> </Button>
</TextBox.InnerRightContent> </TextBox.InnerRightContent>
</TextBox> </TextBox>
<TextBlock Grid.Row="4" Margin="0,0,0,4" Text="{DynamicResource Text.ConfigureWorkspace.Color}" VerticalAlignment="Bottom"/> <TextBlock Grid.Row="4" Margin="0,0,0,4" Text="{DynamicResource Text.ConfigureWorkspace.Color}" VerticalAlignment="Bottom"/>
<v:ColorPicker Grid.Row="5" HorizontalAlignment="Left" Value="{Binding Color, Mode=TwoWay}"/> <v:ColorPicker Grid.Row="5" HorizontalAlignment="Left" Value="{Binding Color, Mode=TwoWay}"/>
<CheckBox Grid.Row="6" <CheckBox Grid.Row="6"
Content="{DynamicResource Text.ConfigureWorkspace.Restore}" Content="{DynamicResource Text.ConfigureWorkspace.Restore}"
IsChecked="{Binding RestoreOnStartup, Mode=TwoWay}"/> IsChecked="{Binding RestoreOnStartup, Mode=TwoWay}"/>

8
src/Views/Conflict.axaml
View file

@ -14,15 +14,15 @@
<StackPanel Orientation="Vertical" IsVisible="{Binding !IsResolved}"> <StackPanel Orientation="Vertical" IsVisible="{Binding !IsResolved}">
<Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/> <Path Width="64" Height="64" Data="{StaticResource Icons.Conflict}" Fill="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
<TextBlock Margin="0,16" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/> <TextBlock Margin="0,16" FontSize="20" FontWeight="Bold" Text="{DynamicResource Text.WorkingCopy.Conflicts}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Center"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,8"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,0,8">
<Border Height="16" VerticalAlignment="Center" Background="Red" CornerRadius="8"> <Border Height="16" VerticalAlignment="Center" Background="Red" CornerRadius="8">
<TextBlock Classes="primary" Text="{Binding Marker}" Foreground="White" FontWeight="Bold" Margin="8,0" FontSize="10"/> <TextBlock Classes="primary" Text="{Binding Marker}" Foreground="White" FontWeight="Bold" Margin="8,0" FontSize="10"/>
</Border> </Border>
<TextBlock Margin="8,0,0,0" VerticalAlignment="Center" Text="{Binding Description}"/> <TextBlock Margin="8,0,0,0" VerticalAlignment="Center" Text="{Binding Description}"/>
</StackPanel> </StackPanel>
<Border Margin="16,0" Padding="8" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"> <Border Margin="16,0" Padding="8" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
<Border.DataTemplates> <Border.DataTemplates>
<DataTemplate DataType="vm:ConflictSourceBranch"> <DataTemplate DataType="vm:ConflictSourceBranch">
@ -96,7 +96,7 @@
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</Border.DataTemplates> </Border.DataTemplates>
<Border.IsVisible> <Border.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}"> <MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="Theirs" Converter="{x:Static ObjectConverters.IsNotNull}"/> <Binding Path="Theirs" Converter="{x:Static ObjectConverters.IsNotNull}"/>

4
src/Views/ConventionalCommitMessageBuilder.axaml
View file

@ -56,11 +56,11 @@
<TextBlock Text="{Binding Name}" Margin="0,0,8,0"/> <TextBlock Text="{Binding Name}" Margin="0,0,8,0"/>
<Border Height="16" CornerRadius="8" Padding="8,0" VerticalAlignment="Center" Background="Green"> <Border Height="16" CornerRadius="8" Padding="8,0" VerticalAlignment="Center" Background="Green">
<TextBlock Text="{Binding Type}" VerticalAlignment="Center" FontSize="11" Foreground="White"/> <TextBlock Text="{Binding Type}" VerticalAlignment="Center" FontSize="11" Foreground="White"/>
</Border> </Border>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</ComboBox.SelectionBoxItemTemplate> </ComboBox.SelectionBoxItemTemplate>
<ComboBox.ItemTemplate> <ComboBox.ItemTemplate>
<DataTemplate DataType="m:ConventionalCommitType"> <DataTemplate DataType="m:ConventionalCommitType">
<Grid Height="22"> <Grid Height="22">

1
src/Views/DeleteMultipleBranches.axaml.cs
View file

@ -10,4 +10,3 @@ namespace SourceGit.Views
} }
} }
} }

2
src/Views/FilterModeSwitchButton.axaml.cs
View file

@ -163,5 +163,3 @@ namespace SourceGit.Views
} }
} }
} }

2
src/Views/Histories.axaml
View file

@ -133,7 +133,7 @@
AheadBrush="{DynamicResource Brush.Accent}" AheadBrush="{DynamicResource Brush.Accent}"
BehindBrush="{DynamicResource Brush.FG1}" BehindBrush="{DynamicResource Brush.FG1}"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
<v:BisectStateIndicator Grid.Column="1" <v:BisectStateIndicator Grid.Column="1"
Background="{DynamicResource Brush.Contents}" Background="{DynamicResource Brush.Contents}"
Foreground="{DynamicResource Brush.FG1}" Foreground="{DynamicResource Brush.FG1}"

4
src/Views/Hotkeys.axaml
View file

@ -69,10 +69,10 @@
<TextBlock Grid.Row="7" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Q, macOS=⌘+Q}"/> <TextBlock Grid.Row="7" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Q, macOS=⌘+Q}"/>
<TextBlock Grid.Row="7" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Quit}" /> <TextBlock Grid.Row="7" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Quit}" />
<TextBlock Grid.Row="8" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+P, macOS=⌘+⇧+P}"/> <TextBlock Grid.Row="8" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+Shift+P, macOS=⌘+⇧+P}"/>
<TextBlock Grid.Row="8" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.SwitchWorkspace}" /> <TextBlock Grid.Row="8" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.SwitchWorkspace}" />
<TextBlock Grid.Row="9" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+P, macOS=⌘+P}"/> <TextBlock Grid.Row="9" Grid.Column="0" Classes="primary bold" Text="{OnPlatform Ctrl+P, macOS=⌘+P}"/>
<TextBlock Grid.Row="9" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.SwitchTab}" /> <TextBlock Grid.Row="9" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.SwitchTab}" />
</Grid> </Grid>

4
src/Views/Launcher.axaml
View file

@ -102,7 +102,7 @@
</DataTemplate> </DataTemplate>
</ContentControl.DataTemplates> </ContentControl.DataTemplates>
</ContentControl> </ContentControl>
<!-- Workspace/Pages Switcher --> <!-- Workspace/Pages Switcher -->
<Border Grid.Row="0" Grid.RowSpan="2" <Border Grid.Row="0" Grid.RowSpan="2"
Background="Transparent" Background="Transparent"
@ -115,7 +115,7 @@
<DataTemplate DataType="vm:WorkspaceSwitcher"> <DataTemplate DataType="vm:WorkspaceSwitcher">
<v:WorkspaceSwitcher/> <v:WorkspaceSwitcher/>
</DataTemplate> </DataTemplate>
<DataTemplate DataType="vm:LauncherPageSwitcher"> <DataTemplate DataType="vm:LauncherPageSwitcher">
<v:LauncherPageSwitcher/> <v:LauncherPageSwitcher/>
</DataTemplate> </DataTemplate>

2
src/Views/LauncherPageSwitcher.axaml
View file

@ -13,7 +13,7 @@
Text="{DynamicResource Text.Launcher.Pages}" Text="{DynamicResource Text.Launcher.Pages}"
FontWeight="Bold" FontWeight="Bold"
HorizontalAlignment="Center"/> HorizontalAlignment="Center"/>
<TextBox Grid.Row="1" <TextBox Grid.Row="1"
Height="24" Height="24"
Margin="4,8,4,0" Margin="4,8,4,0"

1
src/Views/LauncherPageSwitcher.axaml.cs
View file

@ -46,4 +46,3 @@ namespace SourceGit.Views
} }
} }
} }

6
src/Views/LauncherTabBar.axaml
View file

@ -80,7 +80,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
IsVisible="{Binding DirtyBrush, Converter={x:Static ObjectConverters.IsNotNull}}" IsVisible="{Binding DirtyBrush, Converter={x:Static ObjectConverters.IsNotNull}}"
Fill="{Binding DirtyBrush}"/> Fill="{Binding DirtyBrush}"/>
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
Classes="primary" Classes="primary"
VerticalAlignment="Center" VerticalAlignment="Center"
@ -89,7 +89,7 @@
Text="{Binding Node.Name}" Text="{Binding Node.Name}"
IsHitTestVisible="False"/> IsHitTestVisible="False"/>
</Grid> </Grid>
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
Classes="primary" Classes="primary"
HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalAlignment="Stretch" VerticalAlignment="Center"
@ -98,7 +98,7 @@
Text="{DynamicResource Text.PageTabBar.Welcome.Title}" Text="{DynamicResource Text.PageTabBar.Welcome.Title}"
IsVisible="{Binding !Node.IsRepository}" IsVisible="{Binding !Node.IsRepository}"
IsHitTestVisible="False"/> IsHitTestVisible="False"/>
<Button Grid.Column="2" <Button Grid.Column="2"
Classes="icon_button" Classes="icon_button"
Width="16" Height="16" Margin="12,0" Width="16" Height="16" Margin="12,0"

2
src/Views/MoveRepositoryNode.axaml.cs
View file

@ -10,5 +10,3 @@ namespace SourceGit.Views
} }
} }
} }

2
src/Views/NameHighlightedTextBlock.cs
View file

@ -96,7 +96,7 @@ namespace SourceGit.Views
FontSize, FontSize,
Foreground); Foreground);
context.DrawText(formatted, new Point(offsetX, 0)); context.DrawText(formatted, new Point(offsetX, 0));
if (isName) if (isName)
{ {
var lineY = formatted.Baseline + 2; var lineY = formatted.Baseline + 2;

2
src/Views/Repository.axaml
View file

@ -769,7 +769,7 @@
Click="OnBisectCommand" Click="OnBisectCommand"
Tag="reset"/> Tag="reset"/>
</Grid> </Grid>
<Border Grid.Row="2" Background="{DynamicResource Brush.ToolBar}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}"> <Border Grid.Row="2" Background="{DynamicResource Brush.ToolBar}" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border0}">
<Border.IsVisible> <Border.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}"> <MultiBinding Converter="{x:Static BoolConverters.And}">

3
src/Views/RepositoryToolbar.axaml
View file

@ -102,7 +102,7 @@
<Button Classes="icon_button" Width="32" Margin="8,0,0,0" Command="{Binding Cleanup}" ToolTip.Tip="{DynamicResource Text.Repository.Clean}"> <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}"/> <Path Width="14" Height="14" Margin="0,1,0,0" Data="{StaticResource Icons.Clean}"/>
</Button> </Button>
</StackPanel> </StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0"> <StackPanel Grid.Column="2" Orientation="Horizontal" HorizontalAlignment="Right" Margin="0,0,4,0">
@ -132,4 +132,3 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>

1
src/Views/RepositoryToolbar.axaml.cs
View file

@ -152,4 +152,3 @@ namespace SourceGit.Views
} }
} }
} }

1
src/Views/RevisionFileContentViewer.axaml
View file

@ -97,4 +97,3 @@
</DataTemplate> </DataTemplate>
</UserControl.DataTemplates> </UserControl.DataTemplates>
</UserControl> </UserControl>

1
src/Views/RevisionFileContentViewer.axaml.cs
View file

@ -163,4 +163,3 @@ namespace SourceGit.Views
} }
} }
} }

2
src/Views/RevisionFiles.axaml
View file

@ -144,7 +144,7 @@
</ToggleButton> </ToggleButton>
</Grid> </Grid>
</Border> </Border>
<v:RevisionFileContentViewer Grid.Row="1" Content="{Binding ViewRevisionFileContent}"/> <v:RevisionFileContentViewer Grid.Row="1" Content="{Binding ViewRevisionFileContent}"/>
</Grid> </Grid>
</Border> </Border>

1
src/Views/SelfUpdate.axaml.cs
View file

@ -25,7 +25,6 @@ namespace SourceGit.Views
TextArea.TextView.Margin = new Thickness(4, 0); TextArea.TextView.Margin = new Thickness(4, 0);
TextArea.TextView.Options.EnableHyperlinks = false; TextArea.TextView.Options.EnableHyperlinks = false;
TextArea.TextView.Options.EnableEmailHyperlinks = false; TextArea.TextView.Options.EnableEmailHyperlinks = false;
} }
protected override void OnLoaded(RoutedEventArgs e) protected override void OnLoaded(RoutedEventArgs e)

2
src/Views/SubmodulesView.axaml
View file

@ -203,7 +203,7 @@
</Grid> </Grid>
</StackPanel> </StackPanel>
</ToolTip.Tip> </ToolTip.Tip>
<Grid ColumnDefinitions="16,*,Auto" Margin="8,0,0,0" VerticalAlignment="Center"> <Grid ColumnDefinitions="16,*,Auto" Margin="8,0,0,0" VerticalAlignment="Center">
<Path Grid.Column="0" Width="10" Height="10" Margin="8,0" Data="{StaticResource Icons.Submodule}"/> <Path Grid.Column="0" Width="10" Height="10" Margin="8,0" Data="{StaticResource Icons.Submodule}"/>
<TextBlock Grid.Column="1" Text="{Binding Path}" ClipToBounds="True" Classes="primary" TextTrimming="CharacterEllipsis"/> <TextBlock Grid.Column="1" Text="{Binding Path}" ClipToBounds="True" Classes="primary" TextTrimming="CharacterEllipsis"/>

7
src/Views/TagsView.axaml
View file

@ -41,7 +41,7 @@
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
</ListBox.DataTemplates> </ListBox.DataTemplates>
<ListBox.ItemTemplate> <ListBox.ItemTemplate>
<DataTemplate DataType="vm:TagTreeNode"> <DataTemplate DataType="vm:TagTreeNode">
<Border Height="24" <Border Height="24"
@ -50,7 +50,7 @@
DoubleTapped="OnItemDoubleTapped" DoubleTapped="OnItemDoubleTapped"
ContextRequested="OnItemContextRequested" ContextRequested="OnItemContextRequested"
ToolTip.Tip="{Binding ToolTip}" ToolTip.Tip="{Binding ToolTip}"
ToolTip.Placement="Right"> ToolTip.Placement="Right">
<Grid ColumnDefinitions="16,Auto,*,Auto" <Grid ColumnDefinitions="16,Auto,*,Auto"
Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}" Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
VerticalAlignment="Center"> VerticalAlignment="Center">
@ -111,7 +111,7 @@
<TextBlock Text="{Binding Message}" IsVisible="{Binding Message, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/> <TextBlock Text="{Binding Message}" IsVisible="{Binding Message, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
</StackPanel> </StackPanel>
</ToolTip.Tip> </ToolTip.Tip>
<Grid ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center"> <Grid ColumnDefinitions="Auto,*,Auto" VerticalAlignment="Center">
<Path Grid.Column="0" <Path Grid.Column="0"
Margin="8,0,0,0" Margin="8,0,0,0"
@ -133,4 +133,3 @@
</DataTemplate> </DataTemplate>
</UserControl.DataTemplates> </UserControl.DataTemplates>
</UserControl> </UserControl>

1
src/Views/TagsView.axaml.cs
View file

@ -230,4 +230,3 @@ namespace SourceGit.Views
} }
} }
} }

6
src/Views/ViewLogs.axaml
View file

@ -44,7 +44,7 @@
<ColumnDefinition Width="4"/> <ColumnDefinition Width="4"/>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<ListBox Grid.Column="0" <ListBox Grid.Column="0"
Padding="4" Padding="4"
Background="{DynamicResource Brush.Contents}" Background="{DynamicResource Brush.Contents}"
@ -84,14 +84,14 @@
Width="14" Height="14" Width="14" Height="14"
Margin="4,0,4,0" Margin="4,0,4,0"
IsVisible="{Binding !IsComplete}"/> IsVisible="{Binding !IsComplete}"/>
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
Classes="primary" Classes="primary"
Margin="4,0,0,0" Margin="4,0,0,0"
Text="{Binding Name}" Text="{Binding Name}"
VerticalAlignment="Center" VerticalAlignment="Center"
TextTrimming="CharacterEllipsis"/> TextTrimming="CharacterEllipsis"/>
<v:CommandLogTime Grid.Column="2" <v:CommandLogTime Grid.Column="2"
Classes="primary" Classes="primary"
Margin="4,0" Margin="4,0"

2
src/Views/Welcome.axaml
View file

@ -14,7 +14,7 @@
<ColumnDefinition Width="2*" MinWidth="600"/> <ColumnDefinition Width="2*" MinWidth="600"/>
<ColumnDefinition Width="1*"/> <ColumnDefinition Width="1*"/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!-- Managed Repositories --> <!-- Managed Repositories -->
<Grid Grid.Row="0" Grid.Column="1" Margin="8" RowDefinitions="Auto,*"> <Grid Grid.Row="0" Grid.Column="1" Margin="8" RowDefinitions="Auto,*">
<!-- Search Box --> <!-- Search Box -->

1
src/Views/WelcomeToolbar.axaml
View file

@ -32,4 +32,3 @@
</StackPanel> </StackPanel>
</Grid> </Grid>
</UserControl> </UserControl>

1
src/Views/WelcomeToolbar.axaml.cs
View file

@ -50,4 +50,3 @@ namespace SourceGit.Views
} }
} }
} }

4
src/Views/WorkingCopy.axaml
View file

@ -168,7 +168,7 @@
ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode, Mode=TwoWay}"/> ViewMode="{Binding Source={x:Static vm:Preferences.Instance}, Path=StagedChangeViewMode, Mode=TwoWay}"/>
</Grid> </Grid>
</Border> </Border>
<!-- Staged Changes --> <!-- Staged Changes -->
<v:ChangeCollectionView Grid.Row="1" <v:ChangeCollectionView Grid.Row="1"
x:Name="StagedChangesView" x:Name="StagedChangesView"
@ -357,7 +357,7 @@
<Binding Path="CommitMessage" Converter="{x:Static c:StringConverters.IsNotNullOrWhitespace}"/> <Binding Path="CommitMessage" Converter="{x:Static c:StringConverters.IsNotNullOrWhitespace}"/>
</MultiBinding> </MultiBinding>
</Button.IsEnabled> </Button.IsEnabled>
<Button.IsVisible> <Button.IsVisible>
<MultiBinding Converter="{x:Static BoolConverters.And}"> <MultiBinding Converter="{x:Static BoolConverters.And}">
<Binding Path="HasRemotes"/> <Binding Path="HasRemotes"/>

3
src/Views/WorkspaceSwitcher.axaml
View file

@ -12,7 +12,7 @@
Text="{DynamicResource Text.Launcher.Workspaces}" Text="{DynamicResource Text.Launcher.Workspaces}"
FontWeight="Bold" FontWeight="Bold"
HorizontalAlignment="Center"/> HorizontalAlignment="Center"/>
<TextBox Grid.Row="1" <TextBox Grid.Row="1"
Height="24" Height="24"
Margin="4,8,4,0" Margin="4,8,4,0"
@ -108,4 +108,3 @@
</ListBox> </ListBox>
</Grid> </Grid>
</UserControl> </UserControl>

1
src/Views/WorkspaceSwitcher.axaml.cs
View file

@ -46,4 +46,3 @@ namespace SourceGit.Views
} }
} }
} }