michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-22 20:37:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

code_style: remove all IDE warnings

Browse source
This commit is contained in:
leo 2024-07-14 15:55:15 +08:00
parent 9ac550242e
commit a807aa9e12
No known key found for this signature in database
94 changed files with 785 additions and 807 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/App.axaml.cs
View file

@ -5,7 +5,6 @@ using System.Net.Http;
using System.Reflection;
using System.Text;
using System.Text.Json;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows.Input;
@ -45,12 +44,12 @@ namespace SourceGit
[STAThread]
public static void Main(string[] args)
{
AppDomain.CurrentDomain.UnhandledException += (sender, e) =>
AppDomain.CurrentDomain.UnhandledException += (_, e) =>
{
LogException(e.ExceptionObject as Exception);
};
TaskScheduler.UnobservedTaskException += (sender, e) =>
TaskScheduler.UnobservedTaskException += (_, e) =>
{
LogException(e.Exception);
e.SetObserved();
@ -333,7 +332,8 @@ namespace SourceGit
private static void LogException(Exception ex)
{
if (ex == null) return;
if (ex == null)
return;
var builder = new StringBuilder();
builder.Append($"Crash::: {ex.GetType().FullName}: {ex.Message}\n\n");
@ -467,7 +467,7 @@ namespace SourceGit
if (!File.Exists(file))
Environment.Exit(-1);
desktop.MainWindow = new Views.CodeEditor(file);
desktop.MainWindow = new Views.StandaloneCommitMessageEditor(file);
return true;
}

5
src/Commands/CompareRevisions.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Text.RegularExpressions;
namespace SourceGit.Commands
@ -18,7 +19,7 @@ namespace SourceGit.Commands
public List<Models.Change> Result()
{
Exec();
_changes.Sort((l, r) => l.Path.CompareTo(r.Path));
_changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
return _changes;
}

16
src/Resources/Styles.axaml
View file

@ -169,6 +169,9 @@
<Setter Property="MaxWidth" Value="1024"/>
<Setter Property="MaxHeight" Value="768"/>
</Style>
<Style Selector="Grid.repository_leftpanel">
</Style>
<Style Selector="Path">
<Setter Property="Fill" Value="{DynamicResource Brush.FG1}"/>
@ -178,6 +181,7 @@
</Style>
<Style Selector="Path[IsVisible=True].rotating">
<Setter Property="Opacity" Value="0"/>
<Setter Property="Data" Value="{StaticResource Icons.Loading}"/>
<Style.Animations>
<Animation Duration="0:0:1" IterationCount="Infinite">
<KeyFrame Cue="0%">
@ -193,6 +197,7 @@
</Style>
<Style Selector="Path[IsVisible=True].waiting">
<Setter Property="Opacity" Value="0"/>
<Setter Property="Data" Value="{StaticResource Icons.Waiting}"/>
<Style.Animations>
<Animation Duration="0:0:1" IterationCount="Infinite">
<KeyFrame Cue="0%">
@ -1191,6 +1196,17 @@
<Style Selector="ToggleButton.toggle_untracked:pointerover /template/ Path#PART_IndicatorIcon">
<Setter Property="Opacity" Value="1"/>
</Style>
<Style Selector="Slider">
<Style.Resources>
<Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
<GridLength x:Key="SliderPreContentMargin">0</GridLength>
<GridLength x:Key="SliderPostContentMargin">0</GridLength>
<CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
<x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
<x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
</Style.Resources>
</Style>
<Style Selector="TabItem">
<Setter Property="FontSize" Value="14"/>

145
src/ViewModels/ChangeTreeNode.cs Normal file
View file

@ -0,0 +1,145 @@
using System;
using System.Collections.Generic;
using Avalonia.Collections;
using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.ViewModels
{
public class ChangeTreeNode : ObservableObject
{
public string FullPath { get; set; } = string.Empty;
public int Depth { get; private set; } = 0;
public Models.Change Change { get; set; } = null;
public List<ChangeTreeNode> Children { get; set; } = new List<ChangeTreeNode>();
public bool IsFolder
{
get => Change == null;
}
public bool IsExpanded
{
get => _isExpanded;
set => SetProperty(ref _isExpanded, value);
}
public ChangeTreeNode(Models.Change c, int depth)
{
FullPath = c.Path;
Depth = depth;
Change = c;
IsExpanded = false;
}
public ChangeTreeNode(string path, bool isExpanded, int depth)
{
FullPath = path;
Depth = depth;
IsExpanded = isExpanded;
}
public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<string> folded)
{
var nodes = new List<ChangeTreeNode>();
var folders = new Dictionary<string, ChangeTreeNode>();
foreach (var c in changes)
{
var sepIdx = c.Path.IndexOf('/', StringComparison.Ordinal);
if (sepIdx == -1)
{
nodes.Add(new ChangeTreeNode(c, 0));
}
else
{
ChangeTreeNode lastFolder = null;
var start = 0;
var depth = 0;
while (sepIdx != -1)
{
var folder = c.Path.Substring(0, sepIdx);
if (folders.TryGetValue(folder, out var value))
{
lastFolder = value;
}
else if (lastFolder == null)
{
lastFolder = new ChangeTreeNode(folder, !folded.Contains(folder), depth);
folders.Add(folder, lastFolder);
InsertFolder(nodes, lastFolder);
}
else
{
var cur = new ChangeTreeNode(folder, !folded.Contains(folder), depth);
folders.Add(folder, cur);
InsertFolder(lastFolder.Children, cur);
lastFolder = cur;
}
start = sepIdx + 1;
depth++;
sepIdx = c.Path.IndexOf('/', start);
}
lastFolder.Children.Add(new ChangeTreeNode(c, depth));
}
}
Sort(nodes);
folders.Clear();
return nodes;
}
private static void InsertFolder(List<ChangeTreeNode> collection, ChangeTreeNode subFolder)
{
for (int i = 0; i < collection.Count; i++)
{
if (!collection[i].IsFolder)
{
collection.Insert(i, subFolder);
return;
}
}
collection.Add(subFolder);
}
private static void Sort(List<ChangeTreeNode> nodes)
{
foreach (var node in nodes)
{
if (node.IsFolder)
Sort(node.Children);
}
nodes.Sort((l, r) =>
{
if (l.IsFolder)
return r.IsFolder ? string.Compare(l.FullPath, r.FullPath, StringComparison.Ordinal) : -1;
return r.IsFolder ? 1 : string.Compare(l.FullPath, r.FullPath, StringComparison.Ordinal);
});
}
private bool _isExpanded = true;
}
public class ChangeCollectionAsTree
{
public List<ChangeTreeNode> Tree { get; set; } = new List<ChangeTreeNode>();
public AvaloniaList<ChangeTreeNode> Rows { get; set; } = new AvaloniaList<ChangeTreeNode>();
}
public class ChangeCollectionAsGrid
{
public AvaloniaList<Models.Change> Changes { get; set; } = new AvaloniaList<Models.Change>();
}
public class ChangeCollectionAsList
{
public AvaloniaList<Models.Change> Changes { get; set; } = new AvaloniaList<Models.Change>();
}
}

12
src/ViewModels/Preference.cs
View file

@ -349,8 +349,8 @@ namespace SourceGit.ViewModels
{
if (l.IsRepository != r.IsRepository)
return l.IsRepository ? 1 : -1;
else
return l.Name.CompareTo(r.Name);
return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
});
collection.Clear();
@ -413,13 +413,9 @@ namespace SourceGit.ViewModels
list.Sort((l, r) =>
{
if (l.IsRepository != r.IsRepository)
{
return l.IsRepository ? 1 : -1;
}
else
{
return l.Name.CompareTo(r.Name);
}
return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
});
container.Clear();

32
src/ViewModels/RevisionFileTreeNode.cs Normal file
View file

@ -0,0 +1,32 @@
using System.Collections.Generic;
using System.IO;
using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.ViewModels
{
public class RevisionFileTreeNode : ObservableObject
{
public Models.Object Backend { get; set; } = null;
public int Depth { get; set; } = 0;
public List<RevisionFileTreeNode> Children { get; set; } = new List<RevisionFileTreeNode>();
public string Name
{
get => Backend == null ? string.Empty : Path.GetFileName(Backend.Path);
}
public bool IsFolder
{
get => Backend != null && Backend.Type == Models.ObjectType.Tree;
}
public bool IsExpanded
{
get => _isExpanded;
set => SetProperty(ref _isExpanded, value);
}
private bool _isExpanded = false;
}
}

1
src/Views/About.axaml
View file

@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.About"

16
src/Views/About.axaml.cs
View file

@ -16,40 +16,42 @@ namespace SourceGit.Views
public About()
{
var ver = Assembly.GetExecutingAssembly().GetName().Version;
Version = $"{ver.Major}.{ver.Minor}";
if (ver != null)
Version = $"{ver.Major}.{ver.Minor}";
DataContext = this;
InitializeComponent();
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
Close();
}
private void OnVisitAvaloniaUI(object sender, PointerPressedEventArgs e)
private void OnVisitAvaloniaUI(object _, PointerPressedEventArgs e)
{
Native.OS.OpenBrowser("https://www.avaloniaui.net/");
e.Handled = true;
}
private void OnVisitAvaloniaEdit(object sender, PointerPressedEventArgs e)
private void OnVisitAvaloniaEdit(object _, PointerPressedEventArgs e)
{
Native.OS.OpenBrowser("https://github.com/AvaloniaUI/AvaloniaEdit");
e.Handled = true;
}
private void OnVisitJetBrainsMonoFont(object sender, PointerPressedEventArgs e)
private void OnVisitJetBrainsMonoFont(object _, PointerPressedEventArgs e)
{
Native.OS.OpenBrowser("https://www.jetbrains.com/lp/mono/");
e.Handled = true;
}
private void OnVisitSourceCode(object sender, PointerPressedEventArgs e)
private void OnVisitSourceCode(object _, PointerPressedEventArgs e)
{
Native.OS.OpenBrowser("https://github.com/sourcegit-scm/sourcegit");
e.Handled = true;

4
src/Views/AddRemote.axaml
View file

@ -2,10 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.AddRemote"
x:DataType="vm:AddRemote">
@ -44,7 +42,7 @@
Text="{DynamicResource Text.SSHKey}"
IsVisible="{Binding UseSSH}"/>
<TextBox Grid.Row="2" Grid.Column="1"
x:Name="txtSSHKey"
x:Name="TxtSshKey"
Height="28"
CornerRadius="3"
IsVisible="{Binding UseSSH}"

16
src/Views/AddRemote.axaml.cs
View file

@ -11,15 +11,21 @@ namespace SourceGit.Views
InitializeComponent();
}
private async void SelectSSHKey(object sender, RoutedEventArgs e)
private async void SelectSSHKey(object _, RoutedEventArgs e)
{
var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }] };
var toplevel = TopLevel.GetTopLevel(this);
if (toplevel == null)
return;
var options = new FilePickerOpenOptions()
{
AllowMultiple = false,
FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }]
};
var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options);
if (selected.Count == 1)
{
txtSSHKey.Text = selected[0].Path.LocalPath;
}
TxtSshKey.Text = selected[0].Path.LocalPath;
e.Handled = true;
}

2
src/Views/AddSubmodule.axaml
View file

@ -2,10 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.AddSubmodule"
x:DataType="vm:AddSubmodule">

3
src/Views/AddWorktree.axaml
View file

@ -2,9 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
xmlns:vm="using:SourceGit.ViewModels"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.AddWorktree"

4
src/Views/AddWorktree.axaml.cs
View file

@ -11,13 +11,13 @@ namespace SourceGit.Views
InitializeComponent();
}
private async void SelectLocation(object sender, RoutedEventArgs e)
private async void SelectLocation(object _, RoutedEventArgs e)
{
var options = new FolderPickerOpenOptions() { AllowMultiple = false };
var toplevel = TopLevel.GetTopLevel(this);
if (toplevel == null)
return;
var options = new FolderPickerOpenOptions() { AllowMultiple = false };
var selected = await toplevel.StorageProvider.OpenFolderPickerAsync(options);
if (selected.Count == 1)
TxtLocation.Text = selected[0].Path.LocalPath;

3
src/Views/Apply.axaml
View file

@ -5,7 +5,6 @@
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.Apply"
x:DataType="vm:Apply">
@ -20,7 +19,7 @@
Margin="0,0,8,0"
Text="{DynamicResource Text.Apply.File}"/>
<TextBox Grid.Row="0" Grid.Column="1"
x:Name="txtPatchFile"
x:Name="TxtPatchFile"
Height="28"
CornerRadius="3"
Watermark="{DynamicResource Text.Apply.File.Placeholder}"

13
src/Views/Apply.axaml.cs
View file

@ -11,18 +11,21 @@ namespace SourceGit.Views
InitializeComponent();
}
private async void SelectPatchFile(object sender, RoutedEventArgs e)
private async void SelectPatchFile(object _, RoutedEventArgs e)
{
var topLevel = TopLevel.GetTopLevel(this);
if (topLevel == null)
return;
var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }] };
var options = new FilePickerOpenOptions()
{
AllowMultiple = false,
FileTypeFilter = [new FilePickerFileType("Patch File") { Patterns = ["*.patch"] }]
};
var selected = await topLevel.StorageProvider.OpenFilePickerAsync(options);
if (selected.Count == 1)
{
txtPatchFile.Text = selected[0].Path.LocalPath;
}
TxtPatchFile.Text = selected[0].Path.LocalPath;
e.Handled = true;
}

6
src/Views/Archive.axaml
View file

@ -14,11 +14,11 @@
Classes="bold"
Text="{DynamicResource Text.Archive.Title}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.Archive.Revision}"/>
<ContentControl Grid.Column="1" Content="{Binding BasedOn}">
<ContentControl Grid.Row="0" Grid.Column="1" Content="{Binding BasedOn}">
<ContentControl.DataTemplates>
<DataTemplate DataType="m:Branch">
<StackPanel Orientation="Horizontal">
@ -49,7 +49,7 @@
Margin="0,0,8,0"
Text="{DynamicResource Text.Archive.File}"/>
<TextBox Grid.Row="1" Grid.Column="1"
x:Name="txtSaveFile"
x:Name="TxtSaveFile"
Height="28"
CornerRadius="3"
Watermark="{DynamicResource Text.Archive.File.Placeholder}"

16
src/Views/Archive.axaml.cs
View file

@ -11,15 +11,21 @@ namespace SourceGit.Views
InitializeComponent();
}
private async void SelectOutputFile(object sender, RoutedEventArgs e)
private async void SelectOutputFile(object _, RoutedEventArgs e)
{
var options = new FilePickerSaveOptions() { DefaultExtension = ".zip", FileTypeChoices = [new FilePickerFileType("ZIP") { Patterns = ["*.zip"] }] };
var toplevel = TopLevel.GetTopLevel(this);
if (toplevel == null)
return;
var options = new FilePickerSaveOptions()
{
DefaultExtension = ".zip",
FileTypeChoices = [new FilePickerFileType("ZIP") { Patterns = ["*.zip"] }]
};
var selected = await toplevel.StorageProvider.SaveFilePickerAsync(options);
if (selected != null)
{
txtSaveFile.Text = selected.Path.LocalPath;
}
TxtSaveFile.Text = selected.Path.LocalPath;
e.Handled = true;
}

1
src/Views/Askpass.axaml
View file

@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.Askpass"

8
src/Views/Askpass.axaml.cs
View file

@ -9,7 +9,7 @@ namespace SourceGit.Views
public partial class Askpass : ChromelessWindow
{
public static readonly StyledProperty<bool> ShowPasswordProperty =
AvaloniaProperty.Register<Askpass, bool>(nameof(ShowPassword), false);
AvaloniaProperty.Register<Askpass, bool>(nameof(ShowPassword));
public bool ShowPassword
{
@ -42,18 +42,18 @@ namespace SourceGit.Views
InitializeComponent();
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
Console.Out.WriteLine("No passphrase entered.");
Environment.Exit(-1);
}
private void EnterPassword(object sender, RoutedEventArgs e)
private void EnterPassword(object _1, RoutedEventArgs _2)
{
Console.Out.Write($"{Passphrase}\n");
Environment.Exit(0);

4
src/Views/AssumeUnchangedManager.axaml.cs
View file

@ -11,12 +11,12 @@ namespace SourceGit.Views
InitializeComponent();
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
Close();
}

10
src/Views/AutoFocusBehaviour.cs
View file

@ -7,7 +7,7 @@ namespace SourceGit.Views
public class AutoFocusBehaviour : AvaloniaObject
{
public static readonly AttachedProperty<bool> IsEnabledProperty =
AvaloniaProperty.RegisterAttached<AutoFocusBehaviour, TextBox, bool>("IsEnabled", false, false);
AvaloniaProperty.RegisterAttached<AutoFocusBehaviour, TextBox, bool>("IsEnabled");
static AutoFocusBehaviour()
{
@ -30,9 +30,11 @@ namespace SourceGit.Views
{
elem.AttachedToVisualTree += (o, _) =>
{
var text = o as TextBox;
text.Focus(NavigationMethod.Directional);
text.CaretIndex = text.Text == null ? 0 : text.Text.Length;
if (o is TextBox box)
{
box.Focus(NavigationMethod.Directional);
box.CaretIndex = box.Text?.Length ?? 0;
}
};
}
}

6
src/Views/Avatar.cs
View file

@ -38,7 +38,7 @@ namespace SourceGit.Views
public Avatar()
{
var refetch = new MenuItem() { Header = App.Text("RefetchAvatar") };
refetch.Click += (o, e) =>
refetch.Click += (_, _) =>
{
if (User != null)
{
@ -59,7 +59,7 @@ namespace SourceGit.Views
return;
var corner = (float)Math.Max(2, Bounds.Width / 16);
var img = Models.AvatarManager.Request(_emailMD5, false);
var img = Models.AvatarManager.Request(_emailMD5);
if (img != null)
{
var rect = new Rect(0, 0, Bounds.Width, Bounds.Height);
@ -114,7 +114,7 @@ namespace SourceGit.Views
foreach (var c in hash)
builder.Append(c.ToString("x2"));
var md5 = builder.ToString();
if (avatar._emailMD5 != md5)
if (avatar._emailMD5 == null || avatar._emailMD5 != md5)
avatar._emailMD5 = md5;
avatar._fallbackBrush = new LinearGradientBrush

3
src/Views/Blame.axaml
View file

@ -2,13 +2,10 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.Blame"
x:Name="me"
x:DataType="vm:Blame"
Icon="/App.ico"
Title="{DynamicResource Text.Blame}"

52
src/Views/Blame.axaml.cs
View file

@ -37,7 +37,7 @@ namespace SourceGit.Views
if (view != null && view.VisualLinesValid)
{
var typeface = view.CreateTypeface();
var underlinePen = new Pen(Brushes.DarkOrange, 1);
var underlinePen = new Pen(Brushes.DarkOrange);
foreach (var line in view.VisualLines)
{
@ -189,7 +189,7 @@ namespace SourceGit.Views
public override void Render(DrawingContext context)
{
var pen = new Pen(_editor.BorderBrush, 1);
var pen = new Pen(_editor.BorderBrush);
context.DrawLine(pen, new Point(0, 0), new Point(0, Bounds.Height));
}
@ -282,21 +282,24 @@ namespace SourceGit.Views
if (string.IsNullOrEmpty(selected))
return;
var icon = new Avalonia.Controls.Shapes.Path();
icon.Width = 10;
icon.Height = 10;
icon.Stretch = Stretch.Uniform;
icon.Data = App.Current?.FindResource("Icons.Copy") as StreamGeometry;
var copy = new MenuItem();
copy.Header = App.Text("Copy");
copy.Icon = icon;
copy.Click += (o, ev) =>
var copy = new MenuItem() { Header = App.Text("Copy") };
copy.Click += (_, ev) =>
{
App.CopyText(selected);
ev.Handled = true;
};
if (this.FindResource("Icons.Copy") is StreamGeometry geo)
{
copy.Icon = new Avalonia.Controls.Shapes.Path()
{
Width = 10,
Height = 10,
Stretch = Stretch.Fill,
Data = geo,
};
}
var menu = new ContextMenu();
menu.Items.Add(copy);
@ -323,7 +326,7 @@ namespace SourceGit.Views
{
public Blame()
{
if (App.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
{
Owner = desktop.MainWindow;
}
@ -331,7 +334,7 @@ namespace SourceGit.Views
InitializeComponent();
}
private void MaximizeOrRestoreWindow(object sender, TappedEventArgs e)
private void MaximizeOrRestoreWindow(object _, TappedEventArgs e)
{
_pressedTitleBar = false;
@ -343,18 +346,22 @@ namespace SourceGit.Views
e.Handled = true;
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
if (e.ClickCount != 2)
_pressedTitleBar = true;
}
private void MoveWindow(object sender, PointerEventArgs e)
private void MoveWindow(object _, PointerEventArgs e)
{
if (!_pressedTitleBar)
if (!_pressedTitleBar || e.Source == null)
return;
var visual = (Visual)e.Source;
if (visual == null)
return;
#pragma warning disable CS0618
BeginMoveDrag(new PointerPressedEventArgs(
e.Source,
e.Pointer,
@ -363,9 +370,10 @@ namespace SourceGit.Views
e.Timestamp,
new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed),
e.KeyModifiers));
#pragma warning restore CS0618
}
private void EndMoveWindow(object sender, PointerReleasedEventArgs e)
private void EndMoveWindow(object _1, PointerReleasedEventArgs _2)
{
_pressedTitleBar = false;
}
@ -376,14 +384,6 @@ namespace SourceGit.Views
GC.Collect();
}
private void OnCommitSHAPointerPressed(object sender, PointerPressedEventArgs e)
{
if (sender is TextBlock txt && DataContext is ViewModels.Blame blame)
blame.NavigateToCommit(txt.Text);
e.Handled = true;
}
private bool _pressedTitleBar = false;
}
}

2
src/Views/BranchCompare.axaml
View file

@ -2,14 +2,12 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.BranchCompare"
x:DataType="vm:BranchCompare"
x:Name="me"
Icon="/App.ico"
Title="{DynamicResource Text.BranchCompare}"
MinWidth="1280" MinHeight="720"

15
src/Views/BranchCompare.axaml.cs
View file

@ -11,7 +11,7 @@ namespace SourceGit.Views
InitializeComponent();
}
private void MaximizeOrRestoreWindow(object sender, TappedEventArgs e)
private void MaximizeOrRestoreWindow(object _, TappedEventArgs e)
{
_pressedTitleBar = false;
@ -23,18 +23,22 @@ namespace SourceGit.Views
e.Handled = true;
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
if (e.ClickCount != 2)
_pressedTitleBar = true;
}
private void MoveWindow(object sender, PointerEventArgs e)
private void MoveWindow(object _, PointerEventArgs e)
{
if (!_pressedTitleBar)
if (!_pressedTitleBar || e.Source == null)
return;
var visual = (Visual)e.Source;
if (visual == null)
return;
#pragma warning disable CS0618
BeginMoveDrag(new PointerPressedEventArgs(
e.Source,
e.Pointer,
@ -43,9 +47,10 @@ namespace SourceGit.Views
e.Timestamp,
new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed),
e.KeyModifiers));
#pragma warning restore CS0618
}
private void EndMoveWindow(object sender, PointerReleasedEventArgs e)
private void EndMoveWindow(object _1, PointerReleasedEventArgs _2)
{
_pressedTitleBar = false;
}

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

@ -97,7 +97,7 @@ namespace SourceGit.Views
DataContext is ViewModels.BranchTreeNode { IsBranch: false } node)
{
var tree = this.FindAncestorOfType<BranchTree>();
tree.ToggleNodeIsExpanded(node);
tree?.ToggleNodeIsExpanded(node);
}
e.Handled = true;

3
src/Views/CaptionButtons.axaml
View file

@ -2,9 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
xmlns:vm="using:SourceGit.ViewModels"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.CaptionButtons">
<StackPanel Orientation="Horizontal">

6
src/Views/CaptionButtons.axaml.cs
View file

@ -11,7 +11,7 @@ namespace SourceGit.Views
InitializeComponent();
}
private void MinimizeWindow(object sender, RoutedEventArgs e)
private void MinimizeWindow(object _1, RoutedEventArgs _2)
{
var window = this.FindAncestorOfType<Window>();
if (window != null)
@ -20,7 +20,7 @@ namespace SourceGit.Views
}
}
private void MaximizeOrRestoreWindow(object sender, RoutedEventArgs e)
private void MaximizeOrRestoreWindow(object _1, RoutedEventArgs _2)
{
var window = this.FindAncestorOfType<Window>();
if (window != null)
@ -29,7 +29,7 @@ namespace SourceGit.Views
}
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
var window = this.FindAncestorOfType<Window>();
if (window != null)

6
src/Views/CaptionButtonsMacOS.axaml.cs
View file

@ -11,7 +11,7 @@ namespace SourceGit.Views
InitializeComponent();
}
private void MinimizeWindow(object sender, RoutedEventArgs e)
private void MinimizeWindow(object _1, RoutedEventArgs _2)
{
var window = this.FindAncestorOfType<Window>();
if (window != null)
@ -20,7 +20,7 @@ namespace SourceGit.Views
}
}
private void MaximizeOrRestoreWindow(object sender, RoutedEventArgs e)
private void MaximizeOrRestoreWindow(object _1, RoutedEventArgs _2)
{
var window = this.FindAncestorOfType<Window>();
if (window != null)
@ -29,7 +29,7 @@ namespace SourceGit.Views
}
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
var window = this.FindAncestorOfType<Window>();
if (window != null)

10
src/Views/ChangeCollectionView.axaml
View file

@ -4,8 +4,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:v="using:SourceGit.Views"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
xmlns:ac="using:Avalonia.Controls.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.ChangeCollectionView"
x:Name="ThisControl">
@ -29,12 +29,12 @@
</UserControl.Styles>
<UserControl.DataTemplates>
<DataTemplate DataType="v:ChangeCollectionAsTree">
<DataTemplate DataType="vm:ChangeCollectionAsTree">
<v:ChangeCollectionContainer ItemsSource="{Binding Rows}"
SelectionMode="{Binding #ThisControl.SelectionMode}"
SelectionChanged="OnRowSelectionChanged">
<ListBox.ItemTemplate>
<DataTemplate DataType="v:ChangeTreeNode">
<DataTemplate DataType="vm:ChangeTreeNode">
<Grid ColumnDefinitions="16,Auto,Auto,*"
Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
Background="Transparent"
@ -62,7 +62,7 @@
</v:ChangeCollectionContainer>
</DataTemplate>
<DataTemplate DataType="v:ChangeCollectionAsGrid">
<DataTemplate DataType="vm:ChangeCollectionAsGrid">
<v:ChangeCollectionContainer ItemsSource="{Binding Changes}"
SelectionMode="{Binding #ThisControl.SelectionMode}"
SelectionChanged="OnRowSelectionChanged">
@ -90,7 +90,7 @@
</v:ChangeCollectionContainer>
</DataTemplate>
<DataTemplate DataType="v:ChangeCollectionAsList">
<DataTemplate DataType="vm:ChangeCollectionAsList">
<v:ChangeCollectionContainer ItemsSource="{Binding Changes}"
SelectionMode="{Binding #ThisControl.SelectionMode}"
SelectionChanged="OnRowSelectionChanged">

198
src/Views/ChangeCollectionView.axaml.cs
View file

@ -2,153 +2,14 @@ using System;
using System.Collections.Generic;
using Avalonia;
using Avalonia.Collections;
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.VisualTree;
using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.Views
{
public class ChangeTreeNode : ObservableObject
{
public string FullPath { get; set; } = string.Empty;
public int Depth { get; private set; } = 0;
public Models.Change Change { get; set; } = null;
public List<ChangeTreeNode> Children { get; set; } = new List<ChangeTreeNode>();
public bool IsFolder
{
get => Change == null;
}
public bool IsExpanded
{
get => _isExpanded;
set => SetProperty(ref _isExpanded, value);
}
public ChangeTreeNode(Models.Change c, int depth)
{
FullPath = c.Path;
Depth = depth;
Change = c;
IsExpanded = false;
}
public ChangeTreeNode(string path, bool isExpanded, int depth)
{
FullPath = path;
Depth = depth;
IsExpanded = isExpanded;
}
public static List<ChangeTreeNode> Build(IList<Models.Change> changes, HashSet<string> folded)
{
var nodes = new List<ChangeTreeNode>();
var folders = new Dictionary<string, ChangeTreeNode>();
foreach (var c in changes)
{
var sepIdx = c.Path.IndexOf('/', StringComparison.Ordinal);
if (sepIdx == -1)
{
nodes.Add(new ChangeTreeNode(c, 0));
}
else
{
ChangeTreeNode lastFolder = null;
var start = 0;
var depth = 0;
while (sepIdx != -1)
{
var folder = c.Path.Substring(0, sepIdx);
if (folders.TryGetValue(folder, out var value))
{
lastFolder = value;
}
else if (lastFolder == null)
{
lastFolder = new ChangeTreeNode(folder, !folded.Contains(folder), depth);
folders.Add(folder, lastFolder);
InsertFolder(nodes, lastFolder);
}
else
{
var cur = new ChangeTreeNode(folder, !folded.Contains(folder), depth);
folders.Add(folder, cur);
InsertFolder(lastFolder.Children, cur);
lastFolder = cur;
}
start = sepIdx + 1;
depth++;
sepIdx = c.Path.IndexOf('/', start);
}
lastFolder.Children.Add(new ChangeTreeNode(c, depth));
}
}
Sort(nodes);
folders.Clear();
return nodes;
}
private static void InsertFolder(List<ChangeTreeNode> collection, ChangeTreeNode subFolder)
{
for (int i = 0; i < collection.Count; i++)
{
if (!collection[i].IsFolder)
{
collection.Insert(i, subFolder);
return;
}
}
collection.Add(subFolder);
}
private static void Sort(List<ChangeTreeNode> nodes)
{
foreach (var node in nodes)
{
if (node.IsFolder)
Sort(node.Children);
}
nodes.Sort((l, r) =>
{
if (l.IsFolder)
return r.IsFolder ? string.Compare(l.FullPath, r.FullPath, StringComparison.Ordinal) : -1;
return r.IsFolder ? 1 : string.Compare(l.FullPath, r.FullPath, StringComparison.Ordinal);
});
}
private bool _isExpanded = true;
}
public class ChangeCollectionAsTree
{
public List<ChangeTreeNode> Tree { get; set; } = new List<ChangeTreeNode>();
public AvaloniaList<ChangeTreeNode> Rows { get; set; } = new AvaloniaList<ChangeTreeNode>();
}
public class ChangeCollectionAsGrid
{
public AvaloniaList<Models.Change> Changes { get; set; } = new AvaloniaList<Models.Change>();
}
public class ChangeCollectionAsList
{
public AvaloniaList<Models.Change> Changes { get; set; } = new AvaloniaList<Models.Change>();
}
public class ChangeTreeNodeToggleButton : ToggleButton
{
protected override Type StyleKeyOverride => typeof(ToggleButton);
@ -156,10 +17,10 @@ namespace SourceGit.Views
protected override void OnPointerPressed(PointerPressedEventArgs e)
{
if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed &&
DataContext is ChangeTreeNode { IsFolder: true } node)
DataContext is ViewModels.ChangeTreeNode { IsFolder: true } node)
{
var tree = this.FindAncestorOfType<ChangeCollectionView>();
tree.ToggleNodeIsExpanded(node);
tree?.ToggleNodeIsExpanded(node);
}
e.Handled = true;
@ -180,7 +41,7 @@ namespace SourceGit.Views
public partial class ChangeCollectionView : UserControl
{
public static readonly StyledProperty<bool> IsWorkingCopyChangeProperty =
AvaloniaProperty.Register<ChangeCollectionView, bool>(nameof(IsWorkingCopyChange), false);
AvaloniaProperty.Register<ChangeCollectionView, bool>(nameof(IsWorkingCopyChange));
public bool IsWorkingCopyChange
{
@ -189,7 +50,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<SelectionMode> SelectionModeProperty =
AvaloniaProperty.Register<ChangeCollectionView, SelectionMode>(nameof(SelectionMode), SelectionMode.Single);
AvaloniaProperty.Register<ChangeCollectionView, SelectionMode>(nameof(SelectionMode));
public SelectionMode SelectionMode
{
@ -207,7 +68,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<List<Models.Change>> ChangesProperty =
AvaloniaProperty.Register<ChangeCollectionView, List<Models.Change>>(nameof(Changes), null);
AvaloniaProperty.Register<ChangeCollectionView, List<Models.Change>>(nameof(Changes));
public List<Models.Change> Changes
{
@ -216,7 +77,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<List<Models.Change>> SelectedChangesProperty =
AvaloniaProperty.Register<ChangeCollectionView, List<Models.Change>>(nameof(SelectedChanges), null);
AvaloniaProperty.Register<ChangeCollectionView, List<Models.Change>>(nameof(SelectedChanges));
public List<Models.Change> SelectedChanges
{
@ -238,9 +99,9 @@ namespace SourceGit.Views
InitializeComponent();
}
public void ToggleNodeIsExpanded(ChangeTreeNode node)
public void ToggleNodeIsExpanded(ViewModels.ChangeTreeNode node)
{
if (_displayContext is ChangeCollectionAsTree tree)
if (_displayContext is ViewModels.ChangeCollectionAsTree tree)
{
node.IsExpanded = !node.IsExpanded;
@ -251,7 +112,7 @@ namespace SourceGit.Views
if (node.IsExpanded)
{
var subrows = new List<ChangeTreeNode>();
var subrows = new List<ViewModels.ChangeTreeNode>();
MakeTreeRows(subrows, node.Children);
tree.Rows.InsertRange(idx + 1, subrows);
}
@ -290,7 +151,7 @@ namespace SourceGit.Views
if (ViewMode == Models.ChangeViewMode.Tree)
{
HashSet<string> oldFolded = new HashSet<string>();
if (_displayContext is ChangeCollectionAsTree oldTree)
if (_displayContext is ViewModels.ChangeCollectionAsTree oldTree)
{
foreach (var row in oldTree.Rows)
{
@ -299,23 +160,23 @@ namespace SourceGit.Views
}
}
var tree = new ChangeCollectionAsTree();
tree.Tree = ChangeTreeNode.Build(changes, oldFolded);
var tree = new ViewModels.ChangeCollectionAsTree();
tree.Tree = ViewModels.ChangeTreeNode.Build(changes, oldFolded);
var rows = new List<ChangeTreeNode>();
var rows = new List<ViewModels.ChangeTreeNode>();
MakeTreeRows(rows, tree.Tree);
tree.Rows.AddRange(rows);
_displayContext = tree;
}
else if (ViewMode == Models.ChangeViewMode.Grid)
{
var grid = new ChangeCollectionAsGrid();
var grid = new ViewModels.ChangeCollectionAsGrid();
grid.Changes.AddRange(changes);
_displayContext = grid;
}
else
{
var list = new ChangeCollectionAsList();
var list = new ViewModels.ChangeCollectionAsList();
list.Changes.AddRange(changes);
_displayContext = list;
}
@ -339,13 +200,13 @@ namespace SourceGit.Views
{
list.SelectedItem = null;
}
else if (_displayContext is ChangeCollectionAsTree tree)
else if (_displayContext is ViewModels.ChangeCollectionAsTree tree)
{
var sets = new HashSet<Models.Change>();
foreach (var c in selected)
sets.Add(c);
var nodes = new List<ChangeTreeNode>();
var nodes = new List<ViewModels.ChangeTreeNode>();
foreach (var row in tree.Rows)
{
if (row.Change != null && sets.Contains(row.Change))
@ -366,7 +227,7 @@ namespace SourceGit.Views
private void OnRowDoubleTapped(object sender, TappedEventArgs e)
{
var grid = sender as Grid;
if (grid.DataContext is ChangeTreeNode node)
if (grid?.DataContext is ViewModels.ChangeTreeNode node)
{
if (node.IsFolder)
{
@ -381,32 +242,35 @@ namespace SourceGit.Views
RaiseEvent(new RoutedEventArgs(ChangeDoubleTappedEvent));
}
}
else if (grid.DataContext is Models.Change)
else if (grid?.DataContext is Models.Change)
{
RaiseEvent(new RoutedEventArgs(ChangeDoubleTappedEvent));
}
}
private void OnRowSelectionChanged(object sender, SelectionChangedEventArgs e)
private void OnRowSelectionChanged(object sender, SelectionChangedEventArgs _)
{
if (_disableSelectionChangingEvent)
return;
_disableSelectionChangingEvent = true;
var selected = new List<Models.Change>();
var list = sender as ListBox;
foreach (var item in list.SelectedItems)
if (sender is ListBox { SelectedItems: not null } list)
{
if (item is Models.Change c)
selected.Add(c);
else if (item is ChangeTreeNode node)
CollectChangesInNode(selected, node);
foreach (var item in list.SelectedItems)
{
if (item is Models.Change c)
selected.Add(c);
else if (item is ViewModels.ChangeTreeNode node)
CollectChangesInNode(selected, node);
}
}
TrySetSelected(selected);
_disableSelectionChangingEvent = false;
}
private void MakeTreeRows(List<ChangeTreeNode> rows, List<ChangeTreeNode> nodes)
private void MakeTreeRows(List<ViewModels.ChangeTreeNode> rows, List<ViewModels.ChangeTreeNode> nodes)
{
foreach (var node in nodes)
{
@ -419,7 +283,7 @@ namespace SourceGit.Views
}
}
private void CollectChangesInNode(List<Models.Change> outs, ChangeTreeNode node)
private void CollectChangesInNode(List<Models.Change> outs, ViewModels.ChangeTreeNode node)
{
if (node.IsFolder)
{

2
src/Views/ChangeStatusIcon.cs
View file

@ -87,7 +87,7 @@ namespace SourceGit.Views
var typeface = new Typeface("fonts:SourceGit#JetBrains Mono");
IBrush background = null;
IBrush background;
string indicator;
if (IsWorkingCopyChange)
{

1
src/Views/ChangeViewModeSwitcher.axaml
View file

@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:v="using:SourceGit.Views"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.ChangeViewModeSwitcher"

5
src/Views/CherryPick.axaml
View file

@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@ -13,12 +12,12 @@
Classes="bold"
Text="{DynamicResource Text.CherryPick}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="100,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.CherryPick.Commit}"/>
<Grid Grid.Column="1" ColumnDefinitions="Auto,Auto,*">
<Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,Auto,*">
<Path Grid.Column="0" Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
<TextBlock Grid.Column="1" Classes="monospace" VerticalAlignment="Center" Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Target.Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>

2
src/Views/Cleanup.axaml
View file

@ -2,9 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.Cleanup"
x:DataType="vm:Cleanup">

11
src/Views/Clone.axaml.cs
View file

@ -11,7 +11,7 @@ namespace SourceGit.Views
InitializeComponent();
}
private async void SelectParentFolder(object sender, RoutedEventArgs e)
private async void SelectParentFolder(object _, RoutedEventArgs e)
{
var options = new FolderPickerOpenOptions() { AllowMultiple = false };
var toplevel = TopLevel.GetTopLevel(this);
@ -25,13 +25,18 @@ namespace SourceGit.Views
e.Handled = true;
}
private async void SelectSSHKey(object sender, RoutedEventArgs e)
private async void SelectSSHKey(object _, RoutedEventArgs e)
{
var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }] };
var toplevel = TopLevel.GetTopLevel(this);
if (toplevel == null)
return;
var options = new FilePickerOpenOptions()
{
AllowMultiple = false,
FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }]
};
var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options);
if (selected.Count == 1)
TxtSshKey.Text = selected[0].Path.LocalPath;

8
src/Views/CommitBaseInfo.axaml.cs
View file

@ -31,8 +31,12 @@ namespace SourceGit.Views
private void OnParentSHAPressed(object sender, PointerPressedEventArgs e)
{
if (DataContext is ViewModels.CommitDetail detail && CanNavigate)
detail.NavigateTo((sender as Control).DataContext as string);
if (sender is Control { DataContext: string sha } &&
DataContext is ViewModels.CommitDetail detail &&
CanNavigate)
{
detail.NavigateTo(sha);
}
e.Handled = true;
}

1
src/Views/CommitChanges.axaml
View file

@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.CommitChanges"
x:DataType="vm:CommitDetail">

12
src/Views/CommitChanges.axaml.cs
View file

@ -11,14 +11,12 @@ namespace SourceGit.Views
private void OnChangeContextRequested(object sender, ContextRequestedEventArgs e)
{
if (DataContext is ViewModels.CommitDetail vm)
if (sender is ChangeCollectionView { SelectedChanges: { } selected } view &&
selected.Count == 1 &&
DataContext is ViewModels.CommitDetail vm)
{
var selected = (sender as ChangeCollectionView)?.SelectedChanges;
if (selected != null && selected.Count == 1)
{
var menu = vm.CreateChangeContextMenu(selected[0]);
(sender as Control)?.OpenContextMenu(menu);
}
var menu = vm.CreateChangeContextMenu(selected[0]);
view.OpenContextMenu(menu);
}
e.Handled = true;

4
src/Views/CommitMessageTextBox.axaml.cs
View file

@ -117,7 +117,7 @@ namespace SourceGit.Views
}
}
private async void OnSubjectTextBoxPreviewKeyDown(object sender, KeyEventArgs e)
private async void OnSubjectTextBoxPreviewKeyDown(object _, KeyEventArgs e)
{
if (e.Key == Key.Enter || (e.Key == Key.Right && SubjectEditor.CaretIndex == Subject.Length))
{
@ -157,7 +157,7 @@ namespace SourceGit.Views
}
}
private void OnDescriptionTextBoxPreviewKeyDown(object sender, KeyEventArgs e)
private void OnDescriptionTextBoxPreviewKeyDown(object _, KeyEventArgs e)
{
if ((e.Key == Key.Back || e.Key == Key.Left) && DescriptionEditor.CaretIndex == 0)
{

4
src/Views/CreateBranch.axaml
View file

@ -15,11 +15,11 @@
Classes="bold"
Text="{DynamicResource Text.CreateBranch.Title}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32" ColumnDefinitions="140,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.CreateBranch.BasedOn}"/>
<ContentControl Grid.Column="1" Content="{Binding BasedOn}">
<ContentControl Grid.Row="0" Grid.Column="1" Content="{Binding BasedOn}">
<ContentControl.DataTemplates>
<DataTemplate DataType="m:Branch">
<StackPanel Orientation="Horizontal">

3
src/Views/DeleteMultipleBranches.axaml
View file

@ -2,10 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.DeleteMultipleBranches"
x:DataType="vm:DeleteMultipleBranches">

4
src/Views/DeleteSubmodule.axaml
View file

@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:c="using:SourceGit.Converters"
xmlns:vm="using:SourceGit.ViewModels"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.DeleteSubmodule"
@ -12,8 +11,7 @@
Classes="bold"
Text="{DynamicResource Text.DeleteSubmodule}"/>
<StackPanel Orientation="Horizontal" Margin="0,16,0,0" Height="28" HorizontalAlignment="Center">
<TextBlock Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
<TextBlock HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.DeleteSubmodule.Path}"/>
<Path Width="12" Height="12"

4
src/Views/DeleteTag.axaml
View file

@ -11,12 +11,12 @@
Classes="bold"
Text="{DynamicResource Text.DeleteTag}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.DeleteTag.Tag}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
<Path Width="14" Height="14" Data="{StaticResource Icons.Tag}"/>
<TextBlock Text="{Binding Target.Name}" Margin="8,0,0,0"/>
</StackPanel>

4
src/Views/EditRemote.axaml
View file

@ -2,10 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.EditRemote"
x:DataType="vm:EditRemote">
@ -44,7 +42,7 @@
Text="{DynamicResource Text.SSHKey}"
IsVisible="{Binding UseSSH}"/>
<TextBox Grid.Row="2" Grid.Column="1"
x:Name="txtSSHKey"
x:Name="TxtSshKey"
Height="26"
CornerRadius="3"
IsVisible="{Binding UseSSH}"

11
src/Views/EditRemote.axaml.cs
View file

@ -11,15 +11,16 @@ namespace SourceGit.Views
InitializeComponent();
}
private async void SelectSSHKey(object sender, RoutedEventArgs e)
private async void SelectSSHKey(object _, RoutedEventArgs e)
{
var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }] };
var toplevel = TopLevel.GetTopLevel(this);
if (toplevel == null)
return;
var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new FilePickerFileType("SSHKey") { Patterns = ["*.*"] }] };
var selected = await toplevel.StorageProvider.OpenFilePickerAsync(options);
if (selected.Count == 1)
{
txtSSHKey.Text = selected[0].Path.LocalPath;
}
TxtSshKey.Text = selected[0].Path.LocalPath;
e.Handled = true;
}

1
src/Views/FastForwardWithoutCheckout.axaml
View file

@ -3,7 +3,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.FastForwardWithoutCheckout"
x:DataType="vm:FastForwardWithoutCheckout">

5
src/Views/Fetch.axaml
View file

@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.Fetch"
x:DataType="vm:Fetch">
@ -13,11 +12,11 @@
Classes="bold"
Text="{DynamicResource Text.Fetch.Title}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32" ColumnDefinitions="120,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.Fetch.Remote}"/>
<ComboBox Grid.Column="1"
<ComboBox Grid.Row="0" Grid.Column="1"
Height="28" Padding="8,0"
VerticalAlignment="Center" HorizontalAlignment="Stretch"
ItemsSource="{Binding Remotes}"

15
src/Views/FileHistories.axaml.cs
View file

@ -11,7 +11,7 @@ namespace SourceGit.Views
InitializeComponent();
}
private void MaximizeOrRestoreWindow(object sender, TappedEventArgs e)
private void MaximizeOrRestoreWindow(object _, TappedEventArgs e)
{
_pressedTitleBar = false;
@ -23,18 +23,22 @@ namespace SourceGit.Views
e.Handled = true;
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
if (e.ClickCount != 2)
_pressedTitleBar = true;
}
private void MoveWindow(object sender, PointerEventArgs e)
private void MoveWindow(object _, PointerEventArgs e)
{
if (!_pressedTitleBar)
if (!_pressedTitleBar || e.Source == null)
return;
var visual = (Visual)e.Source;
if (visual == null)
return;
#pragma warning disable CS0618
BeginMoveDrag(new PointerPressedEventArgs(
e.Source,
e.Pointer,
@ -43,9 +47,10 @@ namespace SourceGit.Views
e.Timestamp,
new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed),
e.KeyModifiers));
#pragma warning restore CS0618
}
private void EndMoveWindow(object sender, PointerReleasedEventArgs e)
private void EndMoveWindow(object _1, PointerReleasedEventArgs _2)
{
_pressedTitleBar = false;
}

6
src/Views/GitFlowFinish.axaml
View file

@ -2,9 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.GitFlowFinish"
x:DataType="vm:GitFlowFinish">
@ -22,11 +20,11 @@
Text="{DynamicResource Text.GitFlow.FinishHotfix}"
IsVisible="{Binding IsHotfix}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.GitFlow.FinishTarget}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
<Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
<TextBlock Text="{Binding Branch.Name}" Margin="8,0,0,0"/>
</StackPanel>

2
src/Views/GitFlowStart.axaml
View file

@ -2,10 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.GitFlowStart"
x:DataType="vm:GitFlowStart">

4
src/Views/Histories.axaml
View file

@ -12,7 +12,7 @@
<v:LayoutableGrid RowDefinitions="*,3,*" ColumnDefinitions="*,3,*"
UseHorizontal="{Binding Source={x:Static vm:Preference.Instance}, Path=UseTwoColumnsLayoutInHistories}">
<Grid Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="3">
<DataGrid x:Name="commitDataGrid"
<DataGrid x:Name="CommitDataGrid"
Background="{DynamicResource Brush.Contents}"
ItemsSource="{Binding Commits}"
SelectionMode="Extended"
@ -171,7 +171,7 @@
</DataGrid.Columns>
</DataGrid>
<v:CommitGraph x:Name="commitGraph"
<v:CommitGraph x:Name="CommitGraph"
Graph="{Binding Graph}"
DotBrush="{DynamicResource Brush.Contents}"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch"

25
src/Views/Histories.axaml.cs
View file

@ -11,7 +11,7 @@ namespace SourceGit.Views
public class LayoutableGrid : Grid
{
public static readonly StyledProperty<bool> UseHorizontalProperty =
AvaloniaProperty.Register<LayoutableGrid, bool>(nameof(UseHorizontal), false);
AvaloniaProperty.Register<LayoutableGrid, bool>(nameof(UseHorizontal));
public bool UseHorizontal
{
@ -96,10 +96,12 @@ namespace SourceGit.Views
{
base.Render(context);
var parent = this.FindAncestorOfType<Histories>();
var grid = this.FindAncestorOfType<Histories>()?.CommitDataGrid;
if (grid == null)
return;
var graph = Graph;
var grid = parent.commitDataGrid;
if (graph == null || grid == null)
if (graph == null)
return;
var rowsPresenter = grid.FindDescendantOfType<DataGridRowsPresenter>();
@ -111,8 +113,7 @@ namespace SourceGit.Views
double startY = 0;
foreach (var child in rowsPresenter.Children)
{
var row = child as DataGridRow;
if (row.IsVisible && row.Bounds.Top <= 0 && row.Bounds.Top > -rowHeight)
if (child is DataGridRow { IsVisible: true, Bounds.Top: <= 0 } row && row.Bounds.Top > -rowHeight)
{
var test = rowHeight * row.GetIndex() - row.Bounds.Top;
if (startY < test)
@ -239,7 +240,7 @@ namespace SourceGit.Views
public partial class Histories : UserControl
{
public static readonly StyledProperty<long> NavigationIdProperty =
AvaloniaProperty.Register<Histories, long>(nameof(NavigationId), 0);
AvaloniaProperty.Register<Histories, long>(nameof(NavigationId));
public long NavigationId
{
@ -252,7 +253,7 @@ namespace SourceGit.Views
NavigationIdProperty.Changed.AddClassHandler<Histories>((h, _) =>
{
// Force scroll selected item (current head) into view. see issue #58
var datagrid = h.commitDataGrid;
var datagrid = h.CommitDataGrid;
if (datagrid != null && datagrid.SelectedItems.Count == 1)
datagrid.ScrollIntoView(datagrid.SelectedItems[0], null);
});
@ -263,16 +264,16 @@ namespace SourceGit.Views
InitializeComponent();
}
private void OnCommitDataGridLayoutUpdated(object sender, EventArgs e)
private void OnCommitDataGridLayoutUpdated(object _1, EventArgs _2)
{
commitGraph.InvalidateVisual();
CommitGraph.InvalidateVisual();
}
private void OnCommitDataGridSelectionChanged(object sender, SelectionChangedEventArgs e)
private void OnCommitDataGridSelectionChanged(object _, SelectionChangedEventArgs e)
{
if (DataContext is ViewModels.Histories histories)
{
histories.Select(commitDataGrid.SelectedItems);
histories.Select(CommitDataGrid.SelectedItems);
}
e.Handled = true;
}

4
src/Views/Hotkeys.axaml.cs
View file

@ -10,12 +10,12 @@ namespace SourceGit.Views
InitializeComponent();
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
Close();
}

12
src/Views/ImageDiffView.axaml
View file

@ -3,7 +3,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@ -157,16 +156,7 @@
Margin="0"
MinHeight="0"
Foreground="{DynamicResource Brush.Border1}"
Value="0.5">
<Slider.Resources>
<Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
<GridLength x:Key="SliderPreContentMargin">0</GridLength>
<GridLength x:Key="SliderPostContentMargin">0</GridLength>
<CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
<x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
<x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
</Slider.Resources>
</Slider>
Value="0.5"/>
<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Top" Margin="8,0,0,0">
<TextBlock Classes="monospace" Text="NEW"/>

16
src/Views/ImageDiffView.axaml.cs
View file

@ -64,7 +64,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<Bitmap> OldImageProperty =
AvaloniaProperty.Register<ImagesSwipeControl, Bitmap>(nameof(OldImage), null);
AvaloniaProperty.Register<ImagesSwipeControl, Bitmap>(nameof(OldImage));
public Bitmap OldImage
{
@ -73,7 +73,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<Bitmap> NewImageProperty =
AvaloniaProperty.Register<ImagesSwipeControl, Bitmap>(nameof(NewImage), null);
AvaloniaProperty.Register<ImagesSwipeControl, Bitmap>(nameof(NewImage));
public Bitmap NewImage
{
@ -185,13 +185,9 @@ namespace SourceGit.Views
private Size GetDesiredSize(Size img, Size available)
{
var w = available.Width;
var h = available.Height;
var sw = available.Width / img.Width;
var sh = available.Height / img.Height;
var scale = Math.Min(sw, sh);
return new Size(scale * img.Width, scale * img.Height);
}
@ -211,7 +207,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<Bitmap> OldImageProperty =
AvaloniaProperty.Register<ImageBlendControl, Bitmap>(nameof(OldImage), null);
AvaloniaProperty.Register<ImageBlendControl, Bitmap>(nameof(OldImage));
public Bitmap OldImage
{
@ -220,7 +216,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<Bitmap> NewImageProperty =
AvaloniaProperty.Register<ImageBlendControl, Bitmap>(nameof(NewImage), null);
AvaloniaProperty.Register<ImageBlendControl, Bitmap>(nameof(NewImage));
public Bitmap NewImage
{
@ -294,13 +290,9 @@ namespace SourceGit.Views
private Size GetDesiredSize(Size img, Size available)
{
var w = available.Width;
var h = available.Height;
var sw = available.Width / img.Width;
var sh = available.Height / img.Height;
var scale = Math.Min(sw, sh);
return new Size(scale * img.Width, scale * img.Height);
}

2
src/Views/InitGitFlow.axaml
View file

@ -2,10 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.InitGitFlow"
x:DataType="vm:InitGitFlow">

15
src/Views/InteractiveRebase.axaml.cs
View file

@ -11,12 +11,12 @@ namespace SourceGit.Views
InitializeComponent();
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
Close();
}
@ -41,12 +41,10 @@ namespace SourceGit.Views
private void OnDataGridKeyDown(object sender, KeyEventArgs e)
{
var datagrid = sender as DataGrid;
var item = datagrid.SelectedItem as ViewModels.InteractiveRebaseItem;
var item = (sender as DataGrid)?.SelectedItem as ViewModels.InteractiveRebaseItem;
if (item == null)
return;
var vm = DataContext as ViewModels.InteractiveRebase;
if (e.Key == Key.P)
item.SetAction(Models.InteractiveRebaseAction.Pick);
else if (e.Key == Key.E)
@ -61,11 +59,14 @@ namespace SourceGit.Views
item.SetAction(Models.InteractiveRebaseAction.Drop);
}
private async void StartJobs(object sender, RoutedEventArgs e)
private async void StartJobs(object _1, RoutedEventArgs _2)
{
var vm = DataContext as ViewModels.InteractiveRebase;
if (vm == null)
return;
Running.IsVisible = true;
Running.IsIndeterminate = true;
var vm = DataContext as ViewModels.InteractiveRebase;
await vm.Start();
Running.IsIndeterminate = false;
Running.IsVisible = false;

1
src/Views/LFSLocks.axaml
View file

@ -3,7 +3,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
xmlns:v="using:SourceGit.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.LFSLocks"

4
src/Views/LFSLocks.axaml.cs
View file

@ -11,12 +11,12 @@ namespace SourceGit.Views
InitializeComponent();
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
Close();
}

2
src/Views/LFSTrackCustomPattern.axaml
View file

@ -2,10 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.LFSTrackCustomPattern"
x:DataType="vm:LFSTrackCustomPattern">

49
src/Views/Launcher.axaml.cs
View file

@ -29,7 +29,7 @@ namespace SourceGit.Views
if (change.Property == WindowStateProperty && MainLayout != null)
{
var state = (WindowState)change.NewValue;
var state = (WindowState)change.NewValue!;
if (state == WindowState.Maximized)
MainLayout.RowDefinitions[0].Height = new GridLength(OperatingSystem.IsMacOS() ? 34 : 30);
else
@ -42,6 +42,8 @@ namespace SourceGit.Views
protected override void OnKeyDown(KeyEventArgs e)
{
var vm = DataContext as ViewModels.Launcher;
if (vm == null)
return;
// Ctrl+Shift+P opens preference dialog (macOS use hotkeys in system menu bar)
if (!OperatingSystem.IsMacOS() && e.KeyModifiers == (KeyModifiers.Control | KeyModifiers.Shift) && e.Key == Key.P)
@ -60,27 +62,31 @@ namespace SourceGit.Views
e.Handled = true;
return;
}
else if (e.Key == Key.T)
if (e.Key == Key.T)
{
vm.AddNewTab();
e.Handled = true;
return;
}
else if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) ||
if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) ||
(!OperatingSystem.IsMacOS() && !e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
{
vm.GotoNextTab();
e.Handled = true;
return;
}
else if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Left) ||
if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Left) ||
(!OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
{
vm.GotoPrevTab();
e.Handled = true;
return;
}
else if (vm.ActivePage.Data is ViewModels.Repository repo)
if (vm.ActivePage.Data is ViewModels.Repository repo)
{
if (e.Key == Key.D1 || e.Key == Key.NumPad1)
{
@ -88,25 +94,29 @@ namespace SourceGit.Views
e.Handled = true;
return;
}
else if (e.Key == Key.D2 || e.Key == Key.NumPad2)
if (e.Key == Key.D2 || e.Key == Key.NumPad2)
{
repo.SelectedViewIndex = 1;
e.Handled = true;
return;
}
else if (e.Key == Key.D3 || e.Key == Key.NumPad3)
if (e.Key == Key.D3 || e.Key == Key.NumPad3)
{
repo.SelectedViewIndex = 2;
e.Handled = true;
return;
}
else if (e.Key == Key.F)
if (e.Key == Key.F)
{
repo.IsSearching = true;
e.Handled = true;
return;
}
else if (e.Key == Key.H && e.KeyModifiers.HasFlag(KeyModifiers.Shift))
if (e.Key == Key.H && e.KeyModifiers.HasFlag(KeyModifiers.Shift))
{
repo.IsSearching = false;
e.Handled = true;
@ -140,12 +150,12 @@ namespace SourceGit.Views
pref.Layout.LauncherHeight = Height;
var vm = DataContext as ViewModels.Launcher;
vm.Quit();
vm?.Quit();
base.OnClosing(e);
}
private void OnTitleBarDoubleTapped(object sender, TappedEventArgs e)
private void OnTitleBarDoubleTapped(object _, TappedEventArgs e)
{
_pressedTitleBar = false;
@ -157,18 +167,22 @@ namespace SourceGit.Views
e.Handled = true;
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
if (e.ClickCount != 2)
_pressedTitleBar = true;
}
private void MoveWindow(object sender, PointerEventArgs e)
private void MoveWindow(object _, PointerEventArgs e)
{
if (!_pressedTitleBar)
if (!_pressedTitleBar || e.Source == null)
return;
var visual = (Visual)e.Source;
if (visual == null)
return;
#pragma warning disable CS0618
BeginMoveDrag(new PointerPressedEventArgs(
e.Source,
e.Pointer,
@ -177,14 +191,15 @@ namespace SourceGit.Views
e.Timestamp,
new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.LeftButtonPressed),
e.KeyModifiers));
#pragma warning restore CS0618
}
private void EndMoveWindow(object sender, PointerReleasedEventArgs e)
private void EndMoveWindow(object _1, PointerReleasedEventArgs _2)
{
_pressedTitleBar = false;
}
private void OnPopupSure(object sender, RoutedEventArgs e)
private void OnPopupSure(object _, RoutedEventArgs e)
{
if (DataContext is ViewModels.Launcher vm)
vm.ActivePage.ProcessPopup();
@ -192,7 +207,7 @@ namespace SourceGit.Views
e.Handled = true;
}
private void OnPopupCancel(object sender, RoutedEventArgs e)
private void OnPopupCancel(object _, RoutedEventArgs e)
{
if (DataContext is ViewModels.Launcher vm)
vm.ActivePage.CancelPopup();

2
src/Views/LauncherTabBar.axaml
View file

@ -3,9 +3,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:m="using:SourceGit.Models"
xmlns:c="using:SourceGit.Converters"
xmlns:v="using:SourceGit.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.LauncherTabBar"
x:DataType="vm:Launcher">

62
src/Views/LauncherTabBar.axaml.cs
View file

@ -36,6 +36,9 @@ namespace SourceGit.Views
continue;
var container = LauncherTabsList.ContainerFromIndex(i);
if (container == null)
continue;
var containerEndX = container.Bounds.Right;
if (containerEndX < startX || containerEndX > endX)
continue;
@ -45,6 +48,9 @@ namespace SourceGit.Views
}
var selected = LauncherTabsList.ContainerFromIndex(selectedIdx);
if (selected == null)
return;
var activeStartX = selected.Bounds.X;
var activeEndX = activeStartX + selected.Bounds.Width;
if (activeStartX > endX + 5 || activeEndX < startX - 5)
@ -52,10 +58,11 @@ namespace SourceGit.Views
var geo = new StreamGeometry();
var angle = Math.PI / 2;
var x = 0.0;
var y = height + 0.25;
using (var ctx = geo.Open())
{
double x;
var drawLeftX = activeStartX - startX + LauncherTabsScroller.Bounds.X;
var drawRightX = activeEndX - startX + LauncherTabsScroller.Bounds.X;
if (drawLeftX < LauncherTabsScroller.Bounds.X)
@ -103,11 +110,11 @@ namespace SourceGit.Views
}
var fill = this.FindResource("Brush.ToolBar") as IBrush;
var stroke = new Pen(this.FindResource("Brush.Border0") as IBrush, 1);
var stroke = new Pen(this.FindResource("Brush.Border0") as IBrush);
context.DrawGeometry(fill, stroke, geo);
}
private void ScrollTabs(object sender, PointerWheelEventArgs e)
private void ScrollTabs(object _, PointerWheelEventArgs e)
{
if (!e.KeyModifiers.HasFlag(KeyModifiers.Shift))
{
@ -119,19 +126,19 @@ namespace SourceGit.Views
}
}
private void ScrollTabsLeft(object sender, RoutedEventArgs e)
private void ScrollTabsLeft(object _, RoutedEventArgs e)
{
LauncherTabsScroller.LineLeft();
e.Handled = true;
}
private void ScrollTabsRight(object sender, RoutedEventArgs e)
private void ScrollTabsRight(object _, RoutedEventArgs e)
{
LauncherTabsScroller.LineRight();
e.Handled = true;
}
private void OnTabsLayoutUpdated(object sender, EventArgs e)
private void OnTabsLayoutUpdated(object _1, EventArgs _2)
{
if (LauncherTabsScroller.Extent.Width > LauncherTabsScroller.Viewport.Width)
{
@ -149,7 +156,7 @@ namespace SourceGit.Views
InvalidateVisual();
}
private void OnTabsSelectionChanged(object sender, SelectionChangedEventArgs e)
private void OnTabsSelectionChanged(object _1, SelectionChangedEventArgs _2)
{
InvalidateVisual();
}
@ -166,22 +173,24 @@ namespace SourceGit.Views
private void OnPointerPressedTab(object sender, PointerPressedEventArgs e)
{
var border = sender as Border;
var point = e.GetCurrentPoint(border);
if (point.Properties.IsMiddleButtonPressed)
if (sender is Border border)
{
var vm = DataContext as ViewModels.Launcher;
vm.CloseTab(border.DataContext as ViewModels.LauncherPage);
e.Handled = true;
return;
var point = e.GetCurrentPoint(border);
if (point.Properties.IsMiddleButtonPressed && border.DataContext is ViewModels.LauncherPage page)
{
(DataContext as ViewModels.Launcher)?.CloseTab(page);
e.Handled = true;
}
else
{
_pressedTab = true;
_startDragTab = false;
_pressedTabPosition = e.GetPosition(border);
}
}
_pressedTab = true;
_startDragTab = false;
_pressedTabPosition = e.GetPosition(sender as Border);
}
private void OnPointerReleasedTab(object sender, PointerReleasedEventArgs e)
private void OnPointerReleasedTab(object _1, PointerReleasedEventArgs _2)
{
_pressedTab = false;
_startDragTab = false;
@ -189,7 +198,7 @@ namespace SourceGit.Views
private void OnPointerMovedOverTab(object sender, PointerEventArgs e)
{
if (_pressedTab && !_startDragTab && sender is Border border)
if (_pressedTab && !_startDragTab && sender is Border { DataContext: ViewModels.LauncherPage page } border)
{
var delta = e.GetPosition(border) - _pressedTabPosition;
var sizeSquired = delta.X * delta.X + delta.Y * delta.Y;
@ -199,7 +208,7 @@ namespace SourceGit.Views
_startDragTab = true;
var data = new DataObject();
data.Set("MovedTab", border.DataContext);
data.Set("MovedTab", page);
DragDrop.DoDragDrop(e, data, DragDropEffects.Move);
}
e.Handled = true;
@ -207,14 +216,11 @@ namespace SourceGit.Views
private void DropTab(object sender, DragEventArgs e)
{
if (e.Data.Contains("MovedTab") && sender is Border border)
if (e.Data.Get("MovedTab") is ViewModels.LauncherPage moved &&
sender is Border { DataContext: ViewModels.LauncherPage to } &&
to != moved)
{
var to = border.DataContext as ViewModels.LauncherPage;
var moved = e.Data.Get("MovedTab") as ViewModels.LauncherPage;
if (to != null && moved != null && to != moved && DataContext is ViewModels.Launcher vm)
{
vm.MoveTab(moved, to);
}
(DataContext as ViewModels.Launcher)?.MoveTab(moved, to);
}
_pressedTab = false;

1
src/Views/LoadingIcon.axaml
View file

@ -3,6 +3,5 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
xmlns:m="using:SourceGit.Models"
x:Class="SourceGit.Views.LoadingIcon">
</UserControl>

7
src/Views/LoadingIcon.axaml.cs
View file

@ -2,7 +2,6 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Shapes;
using Avalonia.Interactivity;
using Avalonia.Media;
namespace SourceGit.Views
{
@ -43,11 +42,7 @@ namespace SourceGit.Views
private void StartAnim()
{
Content = new Path()
{
Data = this.FindResource("Icons.Loading") as StreamGeometry,
Classes = { "rotating" },
};
Content = new Path() { Classes = { "rotating" } };
}
private void StopAnim()

11
src/Views/NameHighlightedTextBlock.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Globalization;
using System.Globalization;
using Avalonia;
using Avalonia.Controls;
@ -62,7 +61,7 @@ namespace SourceGit.Views
if (string.IsNullOrEmpty(text))
return base.MeasureOverride(availableSize);
var typeface = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Normal, FontStretch.Normal);
var typeface = new Typeface(FontFamily);
var formatted = new FormattedText(
Text,
CultureInfo.CurrentCulture,
@ -80,11 +79,11 @@ namespace SourceGit.Views
if (string.IsNullOrEmpty(text))
return;
var normalTypeface = new Typeface(FontFamily, FontStyle.Normal, FontWeight.Normal, FontStretch.Normal);
var underlinePen = new Pen(Foreground, 1);
var normalTypeface = new Typeface(FontFamily);
var underlinePen = new Pen(Foreground);
var offsetX = 0.0;
var parts = text.Split('$', StringSplitOptions.None);
var parts = text.Split('$');
var isName = false;
foreach (var part in parts)
{

10
src/Views/PopupRunningStatus.axaml
View file

@ -6,23 +6,23 @@
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.PopupRunningStatus"
x:Name="me">
x:Name="ThisControl">
<StackPanel Orientation="Vertical">
<Rectangle Height="1" HorizontalAlignment="Stretch" Fill="{DynamicResource Brush.Border1}" />
<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}"/>
</StackPanel>
<TextBlock x:Name="txtDesc"
<TextBlock x:Name="TxtDesc"
HorizontalAlignment="Stretch"
TextWrapping="Wrap"
FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:DoubleConverters.Decrease}}"
FontStyle="Italic"
Text="{Binding #me.Description}"/>
Text="{Binding #ThisControl.Description}"/>
<ProgressBar x:Name="progressBar"
<ProgressBar x:Name="ProgressBar"
Margin="0,8,0,0"
HorizontalAlignment="Stretch"
Background="{DynamicResource Brush.FG2}" Foreground="{DynamicResource Brush.Accent}"

15
src/Views/PopupRunningStatus.axaml.cs
View file

@ -2,7 +2,6 @@ using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Shapes;
using Avalonia.Interactivity;
using Avalonia.Media;
namespace SourceGit.Views
{
@ -51,20 +50,16 @@ namespace SourceGit.Views
private void StartAnim()
{
icon.Content = new Path()
{
Data = this.FindResource("Icons.Waiting") as StreamGeometry,
Classes = { "waiting" },
};
progressBar.IsIndeterminate = true;
Icon.Content = new Path() { Classes = { "waiting" } };
ProgressBar.IsIndeterminate = true;
}
private void StopAnim()
{
if (icon.Content is Path path)
if (Icon.Content is Path path)
path.Classes.Clear();
icon.Content = null;
progressBar.IsIndeterminate = false;
Icon.Content = null;
ProgressBar.IsIndeterminate = false;
}
}
}

48
src/Views/Preference.axaml
View file

@ -5,13 +5,12 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:m="using:SourceGit.Models"
xmlns:c="using:SourceGit.Converters"
xmlns:ac="using:Avalonia.Controls.Converters"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.Preference"
x:DataType="vm:Preference"
x:Name="me"
x:Name="ThisControl"
Icon="/App.ico"
Title="{DynamicResource Text.Preference}"
Width="600" SizeToContent="Height"
@ -123,16 +122,7 @@
IsSnapToTickEnabled="True"
VerticalAlignment="Center"
Foreground="{DynamicResource Brush.Border1}"
Value="{Binding MaxHistoryCommits, Mode=TwoWay}">
<Slider.Resources>
<Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
<GridLength x:Key="SliderPreContentMargin">0</GridLength>
<GridLength x:Key="SliderPostContentMargin">0</GridLength>
<CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
<x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
<x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
</Slider.Resources>
</Slider>
Value="{Binding MaxHistoryCommits, Mode=TwoWay}"/>
<TextBlock Grid.Column="1"
HorizontalAlignment="Right" VerticalAlignment="Center"
@ -186,7 +176,7 @@
MinHeight="28"
Padding="8,0"
HorizontalAlignment="Stretch"
ItemsSource="{Binding #me.InstalledFonts}"
ItemsSource="{Binding #ThisControl.InstalledFonts}"
SelectedItem="{Binding DefaultFont, Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate DataType="FontFamily">
@ -205,7 +195,7 @@
MinHeight="28"
Padding="8,0"
HorizontalAlignment="Stretch"
ItemsSource="{Binding #me.InstalledMonospaceFonts}"
ItemsSource="{Binding #ThisControl.InstalledMonospaceFonts}"
SelectedItem="{Binding MonospaceFont, Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate DataType="FontFamily">
@ -273,12 +263,12 @@
<StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
<TextBlock Classes="monospace"
Margin="0,0,8,0"
Text="{Binding #me.GitVersion}"
IsVisible="{Binding #me.GitVersion, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
Text="{Binding #ThisControl.GitVersion}"
IsVisible="{Binding #ThisControl.GitVersion, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
<Border Background="Transparent"
ToolTip.Tip="{DynamicResource Text.Preference.Git.Invalid}"
IsVisible="{Binding #me.GitVersion, Converter={x:Static c:StringConverters.UnderRecommendGitVersion}}">
IsVisible="{Binding #ThisControl.GitVersion, Converter={x:Static c:StringConverters.UnderRecommendGitVersion}}">
<Path Width="14" Height="14" Data="{StaticResource Icons.Error}" Fill="Red"/>
</Border>
</StackPanel>
@ -344,7 +334,7 @@
<TextBox Grid.Row="4" Grid.Column="1"
Height="28"
CornerRadius="3"
Text="{Binding #me.DefaultUser, Mode=TwoWay}"
Text="{Binding #ThisControl.DefaultUser, Mode=TwoWay}"
Watermark="{DynamicResource Text.Preference.Git.User.Placeholder}"/>
<TextBlock Grid.Row="5" Grid.Column="0"
@ -354,7 +344,7 @@
<TextBox Grid.Row="5" Grid.Column="1"
Height="28"
CornerRadius="3"
Text="{Binding #me.DefaultEmail, Mode=TwoWay}"
Text="{Binding #ThisControl.DefaultEmail, Mode=TwoWay}"
Watermark="{DynamicResource Text.Preference.Git.Email.Placeholder}"/>
<TextBlock Grid.Row="6" Grid.Column="0"
@ -366,7 +356,7 @@
Padding="8,0"
HorizontalAlignment="Stretch"
ItemsSource="{Binding Source={x:Static m:CRLFMode.Supported}}"
SelectedItem="{Binding #me.CRLFMode, Mode=TwoWay}">
SelectedItem="{Binding #ThisControl.CRLFMode, Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate x:DataType="{x:Type m:CRLFMode}">
<Grid ColumnDefinitions="64,*">
@ -409,10 +399,6 @@
<TabItem.Header>
<TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.GPG}"/>
</TabItem.Header>
<TabItem.Resources>
<ac:EnumToBoolConverter x:Key="EnumToBoolConverter"/>
</TabItem.Resources>
<Grid Margin="8" RowDefinitions="32,Auto,32,32,32" ColumnDefinitions="Auto,*">
<TextBlock Grid.Row="0" Grid.Column="0"
@ -424,7 +410,7 @@
Padding="8,0"
HorizontalAlignment="Stretch"
ItemsSource="{Binding Source={x:Static m:GPGFormat.Supported}}"
SelectedItem="{Binding #me.GPGFormat, Mode=TwoWay}">
SelectedItem="{Binding #ThisControl.GPGFormat, Mode=TwoWay}">
<ComboBox.ItemTemplate>
<DataTemplate x:DataType="{x:Type m:GPGFormat}">
<Grid ColumnDefinitions="Auto,*">
@ -439,13 +425,13 @@
Text="{DynamicResource Text.Preference.GPG.Path}"
HorizontalAlignment="Right"
Margin="0,0,16,0"
IsVisible="{Binding #me.GPGFormat.NeedFindProgram}"/>
IsVisible="{Binding #ThisControl.GPGFormat.NeedFindProgram}"/>
<TextBox Grid.Row="1" Grid.Column="1"
Height="28"
CornerRadius="3"
Text="{Binding #me.GPGExecutableFile, Mode=TwoWay}"
Text="{Binding #ThisControl.GPGExecutableFile, Mode=TwoWay}"
Watermark="{DynamicResource Text.Preference.GPG.Path.Placeholder}"
IsVisible="{Binding #me.GPGFormat.NeedFindProgram}">
IsVisible="{Binding #ThisControl.GPGFormat.NeedFindProgram}">
<TextBox.InnerRightContent>
<Button Classes="icon_button" Width="30" Height="30" Click="SelectGPGExecutable">
<Path Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
@ -460,16 +446,16 @@
<TextBox Grid.Row="2" Grid.Column="1"
Height="28"
CornerRadius="3"
Text="{Binding #me.GPGUserKey, Mode=TwoWay}"
Text="{Binding #ThisControl.GPGUserKey, Mode=TwoWay}"
Watermark="{DynamicResource Text.Preference.GPG.UserKey.Placeholder}"/>
<CheckBox Grid.Row="3" Grid.Column="1"
Content="{DynamicResource Text.Preference.GPG.CommitEnabled}"
IsChecked="{Binding #me.EnableGPGCommitSigning, Mode=TwoWay}"/>
IsChecked="{Binding #ThisControl.EnableGPGCommitSigning, Mode=TwoWay}"/>
<CheckBox Grid.Row="4" Grid.Column="1"
Content="{DynamicResource Text.Preference.GPG.TagEnabled}"
IsChecked="{Binding #me.EnableGPGTagSigning, Mode=TwoWay}"/>
IsChecked="{Binding #ThisControl.EnableGPGTagSigning, Mode=TwoWay}"/>
</Grid>
</TabItem>

21
src/Views/Preference.axaml.cs
View file

@ -18,13 +18,11 @@ namespace SourceGit.Views
public AvaloniaList<FontFamily> InstalledFonts
{
get;
private set;
}
public AvaloniaList<FontFamily> InstalledMonospaceFonts
{
get;
private set;
}
public string DefaultUser
@ -133,10 +131,8 @@ namespace SourceGit.Views
typeface,
12,
Brushes.White);
if (testI.Width == testW.Width)
{
if (Math.Abs(testI.Width - testW.Width) < 0.0001)
sysMonoFonts.Add(font);
}
}
Dispatcher.UIThread.Post(() => InstalledMonospaceFonts.AddRange(sysMonoFonts));
@ -188,12 +184,12 @@ namespace SourceGit.Views
}
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
var config = new Commands.Config(null).ListAll();
SetIfChanged(config, "user.name", DefaultUser);
@ -210,7 +206,7 @@ namespace SourceGit.Views
Close();
}
private async void SelectThemeOverrideFile(object sender, RoutedEventArgs e)
private async void SelectThemeOverrideFile(object _, RoutedEventArgs e)
{
var options = new FilePickerOpenOptions()
{
@ -227,7 +223,7 @@ namespace SourceGit.Views
e.Handled = true;
}
private async void SelectGitExecutable(object sender, RoutedEventArgs e)
private async void SelectGitExecutable(object _, RoutedEventArgs e)
{
var pattern = OperatingSystem.IsWindows() ? "git.exe" : "git";
var options = new FilePickerOpenOptions()
@ -246,7 +242,7 @@ namespace SourceGit.Views
e.Handled = true;
}
private async void SelectDefaultCloneDir(object sender, RoutedEventArgs e)
private async void SelectDefaultCloneDir(object _1, RoutedEventArgs _2)
{
var options = new FolderPickerOpenOptions() { AllowMultiple = false };
var selected = await StorageProvider.OpenFolderPickerAsync(options);
@ -256,7 +252,7 @@ namespace SourceGit.Views
}
}
private async void SelectGPGExecutable(object sender, RoutedEventArgs e)
private async void SelectGPGExecutable(object _1, RoutedEventArgs _2)
{
var patterns = new List<string>();
if (OperatingSystem.IsWindows())
@ -277,13 +273,12 @@ namespace SourceGit.Views
}
}
private async void SelectExternalMergeTool(object sender, RoutedEventArgs e)
private async void SelectExternalMergeTool(object _1, RoutedEventArgs _2)
{
var type = ViewModels.Preference.Instance.ExternalMergeToolType;
if (type < 0 || type >= Models.ExternalMerger.Supported.Count)
{
ViewModels.Preference.Instance.ExternalMergeToolType = 0;
type = 0;
return;
}

5
src/Views/Pull.axaml
View file

@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
xmlns:ac="using:Avalonia.Controls.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.Pull"
@ -14,11 +13,11 @@
Classes="bold"
Text="{DynamicResource Text.Pull.Title}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="140,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.Pull.Remote}"/>
<ComboBox Grid.Column="1"
<ComboBox Grid.Row="0" Grid.Column="1"
Height="28" Padding="8,0"
VerticalAlignment="Center" HorizontalAlignment="Stretch"
ItemsSource="{Binding Remotes}"

5
src/Views/Push.axaml
View file

@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.Push"
x:DataType="vm:Push">
@ -14,11 +13,11 @@
Text="{DynamicResource Text.Push.Title}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32,Auto,32,32" ColumnDefinitions="150,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.Push.Local}"/>
<ComboBox Grid.Column="1"
<ComboBox Grid.Row="0" Grid.Column="1"
Height="28" Padding="8,0"
VerticalAlignment="Center" HorizontalAlignment="Stretch"
ItemsSource="{Binding LocalBranches}"

5
src/Views/PushTag.axaml
View file

@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.PushTag"
x:DataType="vm:PushTag">
@ -13,12 +12,12 @@
Classes="bold"
Text="{DynamicResource Text.PushTag}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32" ColumnDefinitions="120,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.PushTag.Tag}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
<Path Width="14" Height="14" Data="{StaticResource Icons.Tag}"/>
<TextBlock Text="{Binding Target.Name}" Margin="8,0,0,0"/>
</StackPanel>

3
src/Views/RemoveWorktree.axaml
View file

@ -2,10 +2,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.RemoveWorktree"
x:DataType="vm:RemoveWorktree">

6
src/Views/RenameBranch.axaml
View file

@ -2,10 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.RenameBranch"
x:DataType="vm:RenameBranch">
@ -14,11 +12,11 @@
Classes="bold"
Text="{DynamicResource Text.RenameBranch}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="120,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.RenameBranch.Target}"/>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
<Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
<TextBlock Text="{Binding Target.Name}" Margin="8,0,0,0" />
</StackPanel>

19
src/Views/Repository.axaml
View file

@ -231,13 +231,13 @@
</TextBox.InnerRightContent>
</TextBox>
<Grid Grid.Row="2" x:Name="leftSidebarGroups" Margin="0,4,0,0" RowDefinitions="28,Auto,28,Auto,28,Auto,28,Auto,28,Auto">
<Grid Grid.Row="2" x:Name="LeftSidebarGroups" Margin="0,4,0,0" RowDefinitions="28,Auto,28,Auto,28,Auto,28,Auto,28,Auto">
<!-- Local Branches -->
<ToggleButton Grid.Row="0" Classes="group_expander" IsChecked="{Binding IsLocalBranchGroupExpanded, Mode=TwoWay}">
<TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.Repository.LocalBranches}"/>
</ToggleButton>
<v:BranchTree Grid.Row="1"
x:Name="localBranchTree"
x:Name="LocalBranchTree"
Height="0"
Margin="8,0,4,0"
Nodes="{Binding LocalBranchTrees}"
@ -255,7 +255,7 @@
</Grid>
</ToggleButton>
<v:BranchTree Grid.Row="3"
x:Name="remoteBranchTree"
x:Name="RemoteBranchTree"
Height="0"
Margin="8,0,4,0"
Nodes="{Binding RemoteBranchTrees}"
@ -274,7 +274,7 @@
</Grid>
</ToggleButton>
<DataGrid Grid.Row="5"
x:Name="tagsList"
x:Name="TagsList"
Height="0"
Margin="8,0,4,0"
Background="Transparent"
@ -343,8 +343,7 @@
<ToggleButton Classes="filter"
Margin="0,0,8,0"
Background="Transparent"
Checked="OnToggleTagFilter"
Unchecked="OnToggleTagFilter"
IsCheckedChanged="OnTagFilterIsCheckedChanged"
IsChecked="{Binding IsFiltered}"
ToolTip.Tip="{DynamicResource Text.Filter}"/>
</DataTemplate>
@ -378,7 +377,7 @@
</Grid>
</ToggleButton>
<DataGrid Grid.Row="7"
x:Name="submoduleList"
x:Name="SubmoduleList"
Height="0"
Margin="8,0,4,0"
Background="Transparent"
@ -448,7 +447,7 @@
Command="{Binding PruneWorktrees}"
IsVisible="{Binding Worktrees, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}"
ToolTip.Tip="{DynamicResource Text.Repository.Worktrees.Prune}">
<Path x:Name="icon" Width="12" Height="12" Data="{StaticResource Icons.Loading}"/>
<Path Width="12" Height="12" Data="{StaticResource Icons.Loading}"/>
</Button>
<Button Grid.Column="3"
Classes="icon_button"
@ -461,7 +460,7 @@
</Grid>
</ToggleButton>
<DataGrid Grid.Row="9"
x:Name="worktreeList"
x:Name="WorktreeList"
Height="0"
Margin="8,0,4,0"
Background="Transparent"
@ -534,7 +533,7 @@
<Grid Grid.Row="1" RowDefinitions="Auto,32,*" Margin="8,0,4,8" IsVisible="{Binding IsSearching}" PropertyChanged="OnSearchCommitPanelPropertyChanged">
<!-- Search Input Box -->
<TextBox Grid.Row="0"
x:Name="txtSearchCommitsBox"
x:Name="TxtSearchCommitsBox"
Height="24"
BorderThickness="1"
BorderBrush="{DynamicResource Brush.Border2}"

75
src/Views/Repository.axaml.cs
View file

@ -66,7 +66,7 @@ namespace SourceGit.Views
private void OnSearchCommitPanelPropertyChanged(object sender, AvaloniaPropertyChangedEventArgs e)
{
if (e.Property == IsVisibleProperty && sender is Grid { IsVisible: true })
txtSearchCommitsBox.Focus();
TxtSearchCommitsBox.Focus();
}
private void OnSearchKeyDown(object _, KeyEventArgs e)
@ -98,22 +98,22 @@ namespace SourceGit.Views
private void OnLocalBranchTreeSelectionChanged(object _1, RoutedEventArgs _2)
{
remoteBranchTree.UnselectAll();
tagsList.SelectedItem = null;
RemoteBranchTree.UnselectAll();
TagsList.SelectedItem = null;
}
private void OnRemoteBranchTreeSelectionChanged(object _1, RoutedEventArgs _2)
{
localBranchTree.UnselectAll();
tagsList.SelectedItem = null;
LocalBranchTree.UnselectAll();
TagsList.SelectedItem = null;
}
private void OnTagDataGridSelectionChanged(object sender, SelectionChangedEventArgs _)
{
if (sender is DataGrid { SelectedItem: Models.Tag tag })
{
localBranchTree.UnselectAll();
remoteBranchTree.UnselectAll();
LocalBranchTree.UnselectAll();
RemoteBranchTree.UnselectAll();
if (DataContext is ViewModels.Repository repo)
repo.NavigateToCommit(tag.SHA);
@ -122,17 +122,16 @@ namespace SourceGit.Views
private void OnTagContextRequested(object sender, ContextRequestedEventArgs e)
{
if (sender is DataGrid datagrid && datagrid.SelectedItem != null && DataContext is ViewModels.Repository repo)
if (sender is DataGrid { SelectedItem: Models.Tag tag } grid && DataContext is ViewModels.Repository repo)
{
var tag = datagrid.SelectedItem as Models.Tag;
var menu = repo.CreateContextMenuForTag(tag);
datagrid.OpenContextMenu(menu);
grid.OpenContextMenu(menu);
}
e.Handled = true;
}
private void OnToggleTagFilter(object sender, RoutedEventArgs e)
private void OnTagFilterIsCheckedChanged(object sender, RoutedEventArgs e)
{
if (sender is ToggleButton { DataContext: Models.Tag tag } toggle && DataContext is ViewModels.Repository repo)
{
@ -144,11 +143,10 @@ namespace SourceGit.Views
private void OnSubmoduleContextRequested(object sender, ContextRequestedEventArgs e)
{
if (sender is DataGrid datagrid && datagrid.SelectedItem != null && DataContext is ViewModels.Repository repo)
if (sender is DataGrid { SelectedItem: string submodule } grid && DataContext is ViewModels.Repository repo)
{
var submodule = datagrid.SelectedItem as string;
var menu = repo.CreateContextMenuForSubmodule(submodule);
datagrid.OpenContextMenu(menu);
grid.OpenContextMenu(menu);
}
e.Handled = true;
@ -156,9 +154,8 @@ namespace SourceGit.Views
private void OnDoubleTappedSubmodule(object sender, TappedEventArgs e)
{
if (sender is DataGrid { SelectedItem: not null } grid && DataContext is ViewModels.Repository repo)
if (sender is DataGrid { SelectedItem: string submodule } && DataContext is ViewModels.Repository repo)
{
var submodule = grid.SelectedItem as string;
repo.OpenSubmodule(submodule);
}
@ -167,9 +164,8 @@ namespace SourceGit.Views
private void OnWorktreeContextRequested(object sender, ContextRequestedEventArgs e)
{
if (sender is DataGrid { SelectedItem: not null } grid && DataContext is ViewModels.Repository repo)
if (sender is DataGrid { SelectedItem: Models.Worktree worktree } grid && DataContext is ViewModels.Repository repo)
{
var worktree = grid.SelectedItem as Models.Worktree;
var menu = repo.CreateContextMenuForWorktree(worktree);
grid.OpenContextMenu(menu);
}
@ -179,9 +175,8 @@ namespace SourceGit.Views
private void OnDoubleTappedWorktree(object sender, TappedEventArgs e)
{
if (sender is DataGrid { SelectedItem: not null } grid && DataContext is ViewModels.Repository repo)
if (sender is DataGrid { SelectedItem: Models.Worktree worktree } && DataContext is ViewModels.Repository repo)
{
var worktree = grid.SelectedItem as Models.Worktree;
repo.OpenWorktree(worktree);
}
@ -205,13 +200,13 @@ namespace SourceGit.Views
if (!IsLoaded)
return;
var leftHeight = leftSidebarGroups.Bounds.Height - 28.0 * 5;
var localBranchRows = vm.IsLocalBranchGroupExpanded ? localBranchTree.Rows.Count : 0;
var remoteBranchRows = vm.IsRemoteGroupExpanded ? remoteBranchTree.Rows.Count : 0;
var leftHeight = LeftSidebarGroups.Bounds.Height - 28.0 * 5;
var localBranchRows = vm.IsLocalBranchGroupExpanded ? LocalBranchTree.Rows.Count : 0;
var remoteBranchRows = vm.IsRemoteGroupExpanded ? RemoteBranchTree.Rows.Count : 0;
var desiredBranches = (localBranchRows + remoteBranchRows) * 24.0;
var desiredTag = vm.IsTagGroupExpanded ? tagsList.RowHeight * vm.VisibleTags.Count : 0;
var desiredSubmodule = vm.IsSubmoduleGroupExpanded ? submoduleList.RowHeight * vm.Submodules.Count : 0;
var desiredWorktree = vm.IsWorktreeGroupExpanded ? worktreeList.RowHeight * vm.Worktrees.Count : 0;
var desiredTag = vm.IsTagGroupExpanded ? TagsList.RowHeight * vm.VisibleTags.Count : 0;
var desiredSubmodule = vm.IsSubmoduleGroupExpanded ? SubmoduleList.RowHeight * vm.Submodules.Count : 0;
var desiredWorktree = vm.IsWorktreeGroupExpanded ? WorktreeList.RowHeight * vm.Worktrees.Count : 0;
var desiredOthers = desiredTag + desiredSubmodule + desiredWorktree;
var hasOverflow = (desiredBranches + desiredOthers > leftHeight);
@ -228,7 +223,7 @@ namespace SourceGit.Views
}
leftHeight -= height;
tagsList.Height = height;
TagsList.Height = height;
hasOverflow = (desiredBranches + desiredSubmodule + desiredWorktree) > leftHeight;
}
@ -245,7 +240,7 @@ namespace SourceGit.Views
}
leftHeight -= height;
submoduleList.Height = height;
SubmoduleList.Height = height;
hasOverflow = (desiredBranches + desiredWorktree) > leftHeight;
}
@ -262,7 +257,7 @@ namespace SourceGit.Views
}
leftHeight -= height;
worktreeList.Height = height;
WorktreeList.Height = height;
}
if (desiredBranches > leftHeight)
@ -276,28 +271,28 @@ namespace SourceGit.Views
{
if (local < half)
{
localBranchTree.Height = local;
remoteBranchTree.Height = leftHeight - local;
LocalBranchTree.Height = local;
RemoteBranchTree.Height = leftHeight - local;
}
else if (remote < half)
{
remoteBranchTree.Height = remote;
localBranchTree.Height = leftHeight - remote;
RemoteBranchTree.Height = remote;
LocalBranchTree.Height = leftHeight - remote;
}
else
{
localBranchTree.Height = half;
remoteBranchTree.Height = half;
LocalBranchTree.Height = half;
RemoteBranchTree.Height = half;
}
}
else
{
localBranchTree.Height = leftHeight;
LocalBranchTree.Height = leftHeight;
}
}
else if (vm.IsRemoteGroupExpanded)
{
remoteBranchTree.Height = leftHeight;
RemoteBranchTree.Height = leftHeight;
}
}
else
@ -305,17 +300,15 @@ namespace SourceGit.Views
if (vm.IsLocalBranchGroupExpanded)
{
var height = localBranchRows * 24;
localBranchTree.Height = height;
LocalBranchTree.Height = height;
}
if (vm.IsRemoteGroupExpanded)
{
var height = remoteBranchRows * 24;
remoteBranchTree.Height = height;
RemoteBranchTree.Height = height;
}
}
leftSidebarGroups.InvalidateMeasure();
}
}
}

6
src/Views/RepositoryConfigure.axaml
View file

@ -2,10 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.RepositoryConfigure"
x:DataType="vm:RepositoryConfigure">
@ -15,11 +13,11 @@
Text="{DynamicResource Text.Configure}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="150,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.Configure.User}"/>
<TextBox Grid.Column="1"
<TextBox Grid.Row="0" Grid.Column="1"
Height="28"
CornerRadius="3"
Watermark="{DynamicResource Text.Configure.User.Placeholder}"

5
src/Views/Revert.axaml
View file

@ -2,7 +2,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
@ -13,12 +12,12 @@
Classes="bold"
Text="{DynamicResource Text.Revert}"/>
<Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="130,*">
<TextBlock Grid.Column="0"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right" VerticalAlignment="Center"
Margin="0,0,8,0"
Text="{DynamicResource Text.Revert.Commit}"/>
<Grid Grid.Column="1" ColumnDefinitions="Auto,Auto,*">
<Grid Grid.Row="0" Grid.Column="1" ColumnDefinitions="Auto,Auto,*">
<Path Grid.Column="0" Width="14" Height="14" Margin="0,8,0,0" Data="{StaticResource Icons.Commit}"/>
<TextBlock Grid.Column="1" Classes="monospace" VerticalAlignment="Center" Text="{Binding Target.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}" Foreground="DarkOrange" Margin="8,0,0,0"/>
<TextBlock Grid.Column="2" VerticalAlignment="Center" Text="{Binding Target.Subject}" Margin="4,0,0,0" TextTrimming="CharacterEllipsis"/>

2
src/Views/RevisionCompare.axaml
View file

@ -34,7 +34,7 @@
<Path Grid.Column="1" Width="16" Height="16" Fill="{DynamicResource Brush.FG2}" Data="{DynamicResource Icons.Down}" RenderTransformOrigin="50%,50%" RenderTransform="rotate(270deg)"/>
<Border Grid.Column="2" BorderBrush="{DynamicResource Brush.Border2}" BorderThickness="1" Background="{DynamicResource Brush.Contents}" CornerRadius="4" Padding="4">
<ContentControl Grid.Column="2" Content="{Binding EndPoint}">
<ContentControl Content="{Binding EndPoint}">
<ContentControl.DataTemplates>
<DataTemplate DataType="m:Commit">
<Grid RowDefinitions="Auto,*">

2
src/Views/RevisionFileTreeView.axaml
View file

@ -29,7 +29,7 @@
</ListBox.Styles>
<ListBox.ItemTemplate>
<DataTemplate DataType="v:RevisionFileTreeNode">
<DataTemplate DataType="vm:RevisionFileTreeNode">
<Grid ColumnDefinitions="16,Auto,Auto,*"
Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
Background="Transparent"

110
src/Views/RevisionFileTreeView.axaml.cs
View file

@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using Avalonia;
using Avalonia.Collections;
@ -11,35 +10,8 @@ using Avalonia.Layout;
using Avalonia.Media;
using Avalonia.VisualTree;
using CommunityToolkit.Mvvm.ComponentModel;
namespace SourceGit.Views
{
public class RevisionFileTreeNode : ObservableObject
{
public Models.Object Backend { get; set; } = null;
public int Depth { get; set; } = 0;
public List<RevisionFileTreeNode> Children { get; set; } = new List<RevisionFileTreeNode>();
public string Name
{
get => Backend == null ? string.Empty : Path.GetFileName(Backend.Path);
}
public bool IsFolder
{
get => Backend != null && Backend.Type == Models.ObjectType.Tree;
}
public bool IsExpanded
{
get => _isExpanded;
set => SetProperty(ref _isExpanded, value);
}
private bool _isExpanded = false;
}
public class RevisionFileTreeNodeToggleButton : ToggleButton
{
protected override Type StyleKeyOverride => typeof(ToggleButton);
@ -47,10 +19,10 @@ namespace SourceGit.Views
protected override void OnPointerPressed(PointerPressedEventArgs e)
{
if (e.GetCurrentPoint(this).Properties.IsLeftButtonPressed &&
DataContext is RevisionFileTreeNode { IsFolder: true } node)
DataContext is ViewModels.RevisionFileTreeNode { IsFolder: true } node)
{
var tree = this.FindAncestorOfType<RevisionFileTreeView>();
tree.ToggleNodeIsExpanded(node);
tree?.ToggleNodeIsExpanded(node);
}
e.Handled = true;
@ -59,10 +31,10 @@ namespace SourceGit.Views
public class RevisionTreeNodeIcon : UserControl
{
public static readonly StyledProperty<RevisionFileTreeNode> NodeProperty =
AvaloniaProperty.Register<RevisionTreeNodeIcon, RevisionFileTreeNode>(nameof(Node));
public static readonly StyledProperty<ViewModels.RevisionFileTreeNode> NodeProperty =
AvaloniaProperty.Register<RevisionTreeNodeIcon, ViewModels.RevisionFileTreeNode>(nameof(Node));
public RevisionFileTreeNode Node
public ViewModels.RevisionFileTreeNode Node
{
get => GetValue(NodeProperty);
set => SetValue(NodeProperty, value);
@ -86,31 +58,28 @@ namespace SourceGit.Views
private void UpdateContent()
{
var node = Node;
if (node == null || node.Backend == null)
if (node?.Backend == null)
{
Content = null;
return;
}
var obj = node.Backend;
if (obj.Type == Models.ObjectType.Blob)
switch (obj.Type)
{
CreateContent(14, new Thickness(0, 0, 0, 0), "Icons.File");
}
else if (obj.Type == Models.ObjectType.Commit)
{
CreateContent(14, new Thickness(0, 0, 0, 0), "Icons.Submodule");
}
else
{
if (node.IsExpanded)
CreateContent(14, new Thickness(0, 2, 0, 0), "Icons.Folder.Open", Brushes.Goldenrod);
else
CreateContent(14, new Thickness(0, 2, 0, 0), "Icons.Folder.Fill", Brushes.Goldenrod);
case Models.ObjectType.Blob:
CreateContent("Icons.File");
break;
case Models.ObjectType.Commit:
CreateContent("Icons.Submodule");
break;
default:
CreateContent(node.IsExpanded ? "Icons.Folder.Open" : "Icons.Folder.Fill", Brushes.Goldenrod);
break;
}
}
private void CreateContent(double size, Thickness margin, string iconKey, IBrush fill = null)
private void CreateContent(string iconKey, IBrush fill = null)
{
var geo = this.FindResource(iconKey) as StreamGeometry;
if (geo == null)
@ -118,11 +87,10 @@ namespace SourceGit.Views
var icon = new Avalonia.Controls.Shapes.Path()
{
Width = size,
Height = size,
Width = 14,
Height = 14,
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
Margin = margin,
Data = geo,
};
@ -136,7 +104,7 @@ namespace SourceGit.Views
public partial class RevisionFileTreeView : UserControl
{
public static readonly StyledProperty<string> RevisionProperty =
AvaloniaProperty.Register<RevisionFileTreeView, string>(nameof(Revision), null);
AvaloniaProperty.Register<RevisionFileTreeView, string>(nameof(Revision));
public string Revision
{
@ -144,7 +112,7 @@ namespace SourceGit.Views
set => SetValue(RevisionProperty, value);
}
public AvaloniaList<RevisionFileTreeNode> Rows
public AvaloniaList<ViewModels.RevisionFileTreeNode> Rows
{
get => _rows;
}
@ -154,7 +122,7 @@ namespace SourceGit.Views
InitializeComponent();
}
public void ToggleNodeIsExpanded(RevisionFileTreeNode node)
public void ToggleNodeIsExpanded(ViewModels.RevisionFileTreeNode node)
{
_disableSelectionChangingEvent = true;
node.IsExpanded = !node.IsExpanded;
@ -169,7 +137,7 @@ namespace SourceGit.Views
var subtree = GetChildrenOfTreeNode(node);
if (subtree != null && subtree.Count > 0)
{
var subrows = new List<RevisionFileTreeNode>();
var subrows = new List<ViewModels.RevisionFileTreeNode>();
MakeRows(subrows, subtree, depth + 1);
_rows.InsertRange(idx + 1, subrows);
}
@ -215,16 +183,16 @@ namespace SourceGit.Views
}
foreach (var obj in objects)
_tree.Add(new RevisionFileTreeNode { Backend = obj });
_tree.Add(new ViewModels.RevisionFileTreeNode { Backend = obj });
_tree.Sort((l, r) =>
{
if (l.IsFolder == r.IsFolder)
return l.Name.CompareTo(r.Name);
return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
return l.IsFolder ? -1 : 1;
});
var topTree = new List<RevisionFileTreeNode>();
var topTree = new List<ViewModels.RevisionFileTreeNode>();
MakeRows(topTree, _tree, 0);
_rows.AddRange(topTree);
GC.Collect();
@ -233,7 +201,8 @@ namespace SourceGit.Views
private void OnTreeNodeContextRequested(object sender, ContextRequestedEventArgs e)
{
if (DataContext is ViewModels.CommitDetail vm && sender is Grid { DataContext: RevisionFileTreeNode { Backend: Models.Object obj } } grid)
if (DataContext is ViewModels.CommitDetail vm &&
sender is Grid { DataContext: ViewModels.RevisionFileTreeNode { Backend: { } obj } } grid)
{
if (obj.Type != Models.ObjectType.Tree)
{
@ -247,32 +216,31 @@ namespace SourceGit.Views
private void OnTreeNodeDoubleTapped(object sender, TappedEventArgs e)
{
if (sender is Grid { DataContext: RevisionFileTreeNode { IsFolder: true } node })
if (sender is Grid { DataContext: ViewModels.RevisionFileTreeNode { IsFolder: true } node })
{
var posX = e.GetPosition(this).X;
if (posX < node.Depth * 16 + 16)
return;
ToggleNodeIsExpanded(node);
}
}
}
private void OnRowsSelectionChanged(object sender, SelectionChangedEventArgs e)
private void OnRowsSelectionChanged(object sender, SelectionChangedEventArgs _)
{
if (_disableSelectionChangingEvent)
return;
if (sender is ListBox list && DataContext is ViewModels.CommitDetail vm)
if (sender is ListBox { SelectedItem: ViewModels.RevisionFileTreeNode node } && DataContext is ViewModels.CommitDetail vm)
{
var node = list.SelectedItem as RevisionFileTreeNode;
if (node != null && !node.IsFolder)
if (!node.IsFolder)
vm.ViewRevisionFile(node.Backend);
else
vm.ViewRevisionFile(null);
}
}
private List<RevisionFileTreeNode> GetChildrenOfTreeNode(RevisionFileTreeNode node)
private List<ViewModels.RevisionFileTreeNode> GetChildrenOfTreeNode(ViewModels.RevisionFileTreeNode node)
{
if (!node.IsFolder)
return null;
@ -289,19 +257,19 @@ namespace SourceGit.Views
return null;
foreach (var obj in objects)
node.Children.Add(new RevisionFileTreeNode() { Backend = obj });
node.Children.Add(new ViewModels.RevisionFileTreeNode() { Backend = obj });
node.Children.Sort((l, r) =>
{
if (l.IsFolder == r.IsFolder)
return l.Name.CompareTo(r.Name);
return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
return l.IsFolder ? -1 : 1;
});
return node.Children;
}
private void MakeRows(List<RevisionFileTreeNode> rows, List<RevisionFileTreeNode> nodes, int depth)
private void MakeRows(List<ViewModels.RevisionFileTreeNode> rows, List<ViewModels.RevisionFileTreeNode> nodes, int depth)
{
foreach (var node in nodes)
{
@ -315,8 +283,8 @@ namespace SourceGit.Views
}
}
private List<RevisionFileTreeNode> _tree = new List<RevisionFileTreeNode>();
private AvaloniaList<RevisionFileTreeNode> _rows = new AvaloniaList<RevisionFileTreeNode>();
private List<ViewModels.RevisionFileTreeNode> _tree = new List<ViewModels.RevisionFileTreeNode>();
private AvaloniaList<ViewModels.RevisionFileTreeNode> _rows = new AvaloniaList<ViewModels.RevisionFileTreeNode>();
private bool _disableSelectionChangingEvent = false;
}
}

26
src/Views/RevisionFiles.axaml.cs
View file

@ -49,8 +49,7 @@ namespace SourceGit.Views
{
base.OnDataContextChanged(e);
var source = DataContext as Models.RevisionTextFile;
if (source != null)
if (DataContext is Models.RevisionTextFile source)
Text = source.Content;
else
Text = string.Empty;
@ -62,21 +61,24 @@ namespace SourceGit.Views
if (string.IsNullOrEmpty(selected))
return;
var icon = new Avalonia.Controls.Shapes.Path();
icon.Width = 10;
icon.Height = 10;
icon.Stretch = Stretch.Uniform;
icon.Data = App.Current?.FindResource("Icons.Copy") as StreamGeometry;
var copy = new MenuItem();
copy.Header = App.Text("Copy");
copy.Icon = icon;
copy.Click += (o, ev) =>
var copy = new MenuItem() { Header = App.Text("Copy") };
copy.Click += (_, ev) =>
{
App.CopyText(selected);
ev.Handled = true;
};
if (this.FindResource("Icons.Copy") is Geometry geo)
{
copy.Icon = new Avalonia.Controls.Shapes.Path()
{
Width = 10,
Height = 10,
Stretch = Stretch.Uniform,
Data = geo,
};
}
var menu = new ContextMenu();
menu.Items.Add(copy);

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

@ -11,17 +11,17 @@ namespace SourceGit.Views
InitializeComponent();
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
Close();
}
private void GotoDownload(object sender, RoutedEventArgs e)
private void GotoDownload(object _, RoutedEventArgs e)
{
Native.OS.OpenBrowser("https://github.com/sourcegit-scm/sourcegit/releases/latest");
e.Handled = true;
@ -29,9 +29,9 @@ namespace SourceGit.Views
private void IgnoreThisVersion(object sender, RoutedEventArgs e)
{
var button = sender as Button;
var ver = button.DataContext as Models.Version;
ViewModels.Preference.Instance.IgnoreUpdateTag = ver.TagName;
if (sender is Button { DataContext: Models.Version ver })
ViewModels.Preference.Instance.IgnoreUpdateTag = ver.TagName;
Close();
e.Handled = true;
}

3
src/Views/CodeEditor.axaml → src/Views/StandaloneCommitMessageEditor.axaml
View file

@ -2,10 +2,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.CodeEditor"
x:Class="SourceGit.Views.StandaloneCommitMessageEditor"
Icon="/App.ico"
Title="{DynamicResource Text.CodeEditor}"
Width="800"

17
src/Views/CodeEditor.axaml.cs → src/Views/StandaloneCommitMessageEditor.axaml.cs
View file

@ -1,20 +1,21 @@
using System;
using System.IO;
using System.Text;
using Avalonia.Input;
using Avalonia.Interactivity;
namespace SourceGit.Views
{
public partial class CodeEditor : ChromelessWindow
public partial class StandaloneCommitMessageEditor : ChromelessWindow
{
public CodeEditor()
public StandaloneCommitMessageEditor()
{
_file = string.Empty;
DataContext = this;
InitializeComponent();
}
public CodeEditor(string file)
public StandaloneCommitMessageEditor(string file)
{
_file = file;
DataContext = this;
@ -33,22 +34,22 @@ namespace SourceGit.Views
}
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
Environment.Exit(-1);
}
private void SaveAndClose(object sender, RoutedEventArgs e)
private void SaveAndClose(object _1, RoutedEventArgs _2)
{
File.WriteAllText(_file, Editor.Text);
Environment.Exit(0);
}
private string _file = string.Empty;
private readonly string _file;
}
}

9
src/Views/StashChanges.axaml
View file

@ -2,10 +2,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:vm="using:SourceGit.ViewModels"
xmlns:v="using:SourceGit.Views"
xmlns:c="using:SourceGit.Converters"
mc:Ignorable="d" d:DesignWidth="500" d:DesignHeight="450"
x:Class="SourceGit.Views.StashChanges"
x:DataType="vm:StashChanges">
@ -14,8 +12,11 @@
Classes="bold"
Text="{DynamicResource Text.Stash.Title}"/>
<Grid Margin="8,16,0,0" RowDefinitions="32,Auto" ColumnDefinitions="120,*">
<TextBlock Grid.Column="0" HorizontalAlignment="Right" Margin="8,0" Text="{DynamicResource Text.Stash.Message}"/>
<TextBox Grid.Column="1"
<TextBlock Grid.Row="0" Grid.Column="0"
HorizontalAlignment="Right"
Margin="8,0"
Text="{DynamicResource Text.Stash.Message}"/>
<TextBox Grid.Row="0" Grid.Column="1"
Height="26"
CornerRadius="3"
Text="{Binding Message, Mode=TwoWay}"

3
src/Views/StashesPage.axaml
View file

@ -35,8 +35,7 @@
<!-- Search Bar -->
<Border Grid.Row="1" BorderThickness="0,1" BorderBrush="{DynamicResource Brush.Border0}">
<TextBox Grid.Row="1"
Height="24"
<TextBox Height="24"
Margin="4,0"
BorderThickness="1"
CornerRadius="12"

10
src/Views/Statistics.axaml.cs
View file

@ -40,7 +40,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<List<Models.StatisticsSample>> SamplesProperty =
AvaloniaProperty.Register<Chart, List<Models.StatisticsSample>>(nameof(Samples), null);
AvaloniaProperty.Register<Chart, List<Models.StatisticsSample>>(nameof(Samples));
public List<Models.StatisticsSample> Samples
{
@ -50,7 +50,7 @@ namespace SourceGit.Views
static Chart()
{
SamplesProperty.Changed.AddClassHandler<Chart>((c, e) =>
SamplesProperty.Changed.AddClassHandler<Chart>((c, _) =>
{
c._hitBoxes.Clear();
c._lastHitIdx = -1;
@ -87,7 +87,7 @@ namespace SourceGit.Views
maxV = (int)Math.Ceiling(maxV / 500.0) * 500;
var typeface = new Typeface("fonts:SourceGit#JetBrains Mono");
var pen = new Pen(LineBrush, 1);
var pen = new Pen(LineBrush);
var width = Bounds.Width;
var height = Bounds.Height;
@ -228,12 +228,12 @@ namespace SourceGit.Views
InitializeComponent();
}
private void BeginMoveWindow(object sender, PointerPressedEventArgs e)
private void BeginMoveWindow(object _, PointerPressedEventArgs e)
{
BeginMoveDrag(e);
}
private void CloseWindow(object sender, RoutedEventArgs e)
private void CloseWindow(object _1, RoutedEventArgs _2)
{
Close();
}

130
src/Views/TextDiffView.axaml.cs
View file

@ -22,10 +22,10 @@ using AvaloniaEdit.Utils;
namespace SourceGit.Views
{
public class IThemedTextDiffPresenter : TextEditor
public class ThemedTextDiffPresenter : TextEditor
{
public static readonly StyledProperty<string> FileNameProperty =
AvaloniaProperty.Register<IThemedTextDiffPresenter, string>(nameof(FileName), string.Empty);
AvaloniaProperty.Register<ThemedTextDiffPresenter, string>(nameof(FileName), string.Empty);
public string FileName
{
@ -34,7 +34,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<IBrush> LineBrushProperty =
AvaloniaProperty.Register<IThemedTextDiffPresenter, IBrush>(nameof(LineBrush), new SolidColorBrush(Colors.DarkGray));
AvaloniaProperty.Register<ThemedTextDiffPresenter, IBrush>(nameof(LineBrush), new SolidColorBrush(Colors.DarkGray));
public IBrush LineBrush
{
@ -43,7 +43,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<IBrush> EmptyContentBackgroundProperty =
AvaloniaProperty.Register<IThemedTextDiffPresenter, IBrush>(nameof(EmptyContentBackground), new SolidColorBrush(Color.FromArgb(60, 0, 0, 0)));
AvaloniaProperty.Register<ThemedTextDiffPresenter, IBrush>(nameof(EmptyContentBackground), new SolidColorBrush(Color.FromArgb(60, 0, 0, 0)));
public IBrush EmptyContentBackground
{
@ -52,7 +52,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<IBrush> AddedContentBackgroundProperty =
AvaloniaProperty.Register<IThemedTextDiffPresenter, IBrush>(nameof(AddedContentBackground), new SolidColorBrush(Color.FromArgb(60, 0, 255, 0)));
AvaloniaProperty.Register<ThemedTextDiffPresenter, IBrush>(nameof(AddedContentBackground), new SolidColorBrush(Color.FromArgb(60, 0, 255, 0)));
public IBrush AddedContentBackground
{
@ -61,7 +61,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<IBrush> DeletedContentBackgroundProperty =
AvaloniaProperty.Register<IThemedTextDiffPresenter, IBrush>(nameof(DeletedContentBackground), new SolidColorBrush(Color.FromArgb(60, 255, 0, 0)));
AvaloniaProperty.Register<ThemedTextDiffPresenter, IBrush>(nameof(DeletedContentBackground), new SolidColorBrush(Color.FromArgb(60, 255, 0, 0)));
public IBrush DeletedContentBackground
{
@ -70,7 +70,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<IBrush> AddedHighlightBrushProperty =
AvaloniaProperty.Register<IThemedTextDiffPresenter, IBrush>(nameof(AddedHighlightBrush), new SolidColorBrush(Color.FromArgb(90, 0, 255, 0)));
AvaloniaProperty.Register<ThemedTextDiffPresenter, IBrush>(nameof(AddedHighlightBrush), new SolidColorBrush(Color.FromArgb(90, 0, 255, 0)));
public IBrush AddedHighlightBrush
{
@ -79,7 +79,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<IBrush> DeletedHighlightBrushProperty =
AvaloniaProperty.Register<IThemedTextDiffPresenter, IBrush>(nameof(DeletedHighlightBrush), new SolidColorBrush(Color.FromArgb(80, 255, 0, 0)));
AvaloniaProperty.Register<ThemedTextDiffPresenter, IBrush>(nameof(DeletedHighlightBrush), new SolidColorBrush(Color.FromArgb(80, 255, 0, 0)));
public IBrush DeletedHighlightBrush
{
@ -88,7 +88,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<IBrush> IndicatorForegroundProperty =
AvaloniaProperty.Register<IThemedTextDiffPresenter, IBrush>(nameof(IndicatorForeground), Brushes.Gray);
AvaloniaProperty.Register<ThemedTextDiffPresenter, IBrush>(nameof(IndicatorForeground), Brushes.Gray);
public IBrush IndicatorForeground
{
@ -97,7 +97,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<bool> UseSyntaxHighlightingProperty =
AvaloniaProperty.Register<IThemedTextDiffPresenter, bool>(nameof(UseSyntaxHighlighting), false);
AvaloniaProperty.Register<ThemedTextDiffPresenter, bool>(nameof(UseSyntaxHighlighting));
public bool UseSyntaxHighlighting
{
@ -106,7 +106,7 @@ namespace SourceGit.Views
}
public static readonly StyledProperty<bool> ShowHiddenSymbolsProperty =
AvaloniaProperty.Register<IThemedTextDiffPresenter, bool>(nameof(ShowHiddenSymbols), false);
AvaloniaProperty.Register<ThemedTextDiffPresenter, bool>(nameof(ShowHiddenSymbols));
public bool ShowHiddenSymbols
{
@ -116,7 +116,7 @@ namespace SourceGit.Views
protected override Type StyleKeyOverride => typeof(TextEditor);
public IThemedTextDiffPresenter(TextArea area, TextDocument doc) : base(area, doc)
protected ThemedTextDiffPresenter(TextArea area, TextDocument doc) : base(area, doc)
{
IsReadOnly = true;
ShowLineNumbers = false;
@ -168,7 +168,7 @@ namespace SourceGit.Views
}
}
protected void UpdateTextMate()
private void UpdateTextMate()
{
if (UseSyntaxHighlighting)
{
@ -197,9 +197,9 @@ namespace SourceGit.Views
protected IVisualLineTransformer _lineStyleTransformer = null;
}
public class CombinedTextDiffPresenter : IThemedTextDiffPresenter
public class CombinedTextDiffPresenter : ThemedTextDiffPresenter
{
public class LineNumberMargin : AbstractMargin
private class LineNumberMargin : AbstractMargin
{
public LineNumberMargin(CombinedTextDiffPresenter editor, bool isOldLine)
{
@ -247,18 +247,16 @@ namespace SourceGit.Views
{
return new Size(32, 0);
}
else
{
var typeface = TextView.CreateTypeface();
var test = new FormattedText(
$"{_editor.DiffData.MaxLineNumber}",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
_editor.FontSize,
Brushes.White);
return new Size(test.Width, 0);
}
var typeface = TextView.CreateTypeface();
var test = new FormattedText(
$"{_editor.DiffData.MaxLineNumber}",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
_editor.FontSize,
Brushes.White);
return new Size(test.Width, 0);
}
protected override void OnDataContextChanged(EventArgs e)
@ -271,7 +269,7 @@ namespace SourceGit.Views
private readonly bool _isOldLine;
}
public class VerticalSeperatorMargin : AbstractMargin
private class VerticalSeperatorMargin : AbstractMargin
{
public VerticalSeperatorMargin(CombinedTextDiffPresenter editor)
{
@ -280,7 +278,7 @@ namespace SourceGit.Views
public override void Render(DrawingContext context)
{
var pen = new Pen(_editor.LineBrush, 1);
var pen = new Pen(_editor.LineBrush);
context.DrawLine(pen, new Point(0, 0), new Point(0, Bounds.Height));
}
@ -292,7 +290,7 @@ namespace SourceGit.Views
private readonly CombinedTextDiffPresenter _editor = null;
}
public class LineBackgroundRenderer : IBackgroundRenderer
private class LineBackgroundRenderer : IBackgroundRenderer
{
public KnownLayer Layer => KnownLayer.Background;
@ -344,7 +342,7 @@ namespace SourceGit.Views
private readonly CombinedTextDiffPresenter _editor = null;
}
public class LineStyleTransformer : DocumentColorizingTransformer
private class LineStyleTransformer : DocumentColorizingTransformer
{
public LineStyleTransformer(CombinedTextDiffPresenter editor)
{
@ -405,7 +403,7 @@ namespace SourceGit.Views
base.OnApplyTemplate(e);
var scroller = (ScrollViewer)e.NameScope.Find("PART_ScrollViewer");
scroller.Bind(ScrollViewer.OffsetProperty, new Binding("SyncScrollOffset", BindingMode.TwoWay));
scroller?.Bind(ScrollViewer.OffsetProperty, new Binding("SyncScrollOffset", BindingMode.TwoWay));
}
protected override void OnLoaded(RoutedEventArgs e)
@ -466,7 +464,7 @@ namespace SourceGit.Views
var copy = new MenuItem();
copy.Header = App.Text("Copy");
copy.Icon = App.CreateMenuIcon("Icons.Copy");
copy.Click += (o, ev) =>
copy.Click += (_, ev) =>
{
App.CopyText(SelectedText);
ev.Handled = true;
@ -479,9 +477,9 @@ namespace SourceGit.Views
}
}
public class SingleSideTextDiffPresenter : IThemedTextDiffPresenter
public class SingleSideTextDiffPresenter : ThemedTextDiffPresenter
{
public class LineNumberMargin : AbstractMargin
private class LineNumberMargin : AbstractMargin
{
public LineNumberMargin(SingleSideTextDiffPresenter editor)
{
@ -529,18 +527,16 @@ namespace SourceGit.Views
{
return new Size(32, 0);
}
else
{
var typeface = TextView.CreateTypeface();
var test = new FormattedText(
$"{_editor.DiffData.MaxLineNumber}",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
_editor.FontSize,
Brushes.White);
return new Size(test.Width, 0);
}
var typeface = TextView.CreateTypeface();
var test = new FormattedText(
$"{_editor.DiffData.MaxLineNumber}",
CultureInfo.CurrentCulture,
FlowDirection.LeftToRight,
typeface,
_editor.FontSize,
Brushes.White);
return new Size(test.Width, 0);
}
protected override void OnDataContextChanged(EventArgs e)
@ -552,7 +548,7 @@ namespace SourceGit.Views
private readonly SingleSideTextDiffPresenter _editor;
}
public class VerticalSeperatorMargin : AbstractMargin
private class VerticalSeperatorMargin : AbstractMargin
{
public VerticalSeperatorMargin(SingleSideTextDiffPresenter editor)
{
@ -561,7 +557,7 @@ namespace SourceGit.Views
public override void Render(DrawingContext context)
{
var pen = new Pen(_editor.LineBrush, 1);
var pen = new Pen(_editor.LineBrush);
context.DrawLine(pen, new Point(0, 0), new Point(0, Bounds.Height));
}
@ -573,7 +569,7 @@ namespace SourceGit.Views
private readonly SingleSideTextDiffPresenter _editor = null;
}
public class LineBackgroundRenderer : IBackgroundRenderer
private class LineBackgroundRenderer : IBackgroundRenderer
{
public KnownLayer Layer => KnownLayer.Background;
@ -626,7 +622,7 @@ namespace SourceGit.Views
private readonly SingleSideTextDiffPresenter _editor = null;
}
public class LineStyleTransformer : DocumentColorizingTransformer
private class LineStyleTransformer : DocumentColorizingTransformer
{
public LineStyleTransformer(SingleSideTextDiffPresenter editor)
{
@ -776,7 +772,7 @@ namespace SourceGit.Views
var copy = new MenuItem();
copy.Header = App.Text("Copy");
copy.Icon = App.CreateMenuIcon("Icons.Copy");
copy.Click += (o, ev) =>
copy.Click += (_, ev) =>
{
App.CopyText(SelectedText);
ev.Handled = true;
@ -794,7 +790,7 @@ namespace SourceGit.Views
public partial class TextDiffView : UserControl
{
public static readonly StyledProperty<bool> UseSideBySideDiffProperty =
AvaloniaProperty.Register<TextDiffView, bool>(nameof(UseSideBySideDiff), false);
AvaloniaProperty.Register<TextDiffView, bool>(nameof(UseSideBySideDiff));
public bool UseSideBySideDiff
{
@ -804,7 +800,7 @@ namespace SourceGit.Views
static TextDiffView()
{
UseSideBySideDiffProperty.Changed.AddClassHandler<TextDiffView>((v, e) =>
UseSideBySideDiffProperty.Changed.AddClassHandler<TextDiffView>((v, _) =>
{
if (v.DataContext is Models.TextDiff diff)
{
@ -842,11 +838,7 @@ namespace SourceGit.Views
return;
if (startLine > endLine)
{
var tmp = startLine;
startLine = endLine;
endLine = tmp;
}
(startLine, endLine) = (endLine, startLine);
var selection = GetUnifiedSelection(diff, startLine, endLine, isOldSide);
if (!selection.HasChanges)
@ -868,7 +860,7 @@ namespace SourceGit.Views
stage.Click += (_, e) =>
{
var workcopy = workcopyView.DataContext as ViewModels.WorkingCopy;
workcopy.StageChanges(new List<Models.Change> { change });
workcopy?.StageChanges(new List<Models.Change> { change });
e.Handled = true;
};
@ -878,7 +870,7 @@ namespace SourceGit.Views
discard.Click += (_, e) =>
{
var workcopy = workcopyView.DataContext as ViewModels.WorkingCopy;
workcopy.Discard(new List<Models.Change> { change }, true);
workcopy?.Discard(new List<Models.Change> { change }, true);
e.Handled = true;
};
@ -893,7 +885,7 @@ namespace SourceGit.Views
unstage.Click += (_, e) =>
{
var workcopy = workcopyView.DataContext as ViewModels.WorkingCopy;
workcopy.UnstageChanges(new List<Models.Change> { change });
workcopy?.UnstageChanges(new List<Models.Change> { change });
e.Handled = true;
};
@ -903,7 +895,7 @@ namespace SourceGit.Views
discard.Click += (_, e) =>
{
var workcopy = workcopyView.DataContext as ViewModels.WorkingCopy;
workcopy.Discard(new List<Models.Change> { change }, false);
workcopy?.Discard(new List<Models.Change> { change }, false);
e.Handled = true;
};
@ -925,6 +917,9 @@ namespace SourceGit.Views
stage.Click += (_, e) =>
{
var repo = repoView.DataContext as ViewModels.Repository;
if (repo == null)
return;
repo.SetWatcherEnabled(false);
var tmpFile = Path.GetTempFileName();
@ -957,6 +952,9 @@ namespace SourceGit.Views
discard.Click += (_, e) =>
{
var repo = repoView.DataContext as ViewModels.Repository;
if (repo == null)
return;
repo.SetWatcherEnabled(false);
var tmpFile = Path.GetTempFileName();
@ -994,6 +992,9 @@ namespace SourceGit.Views
unstage.Click += (_, e) =>
{
var repo = repoView.DataContext as ViewModels.Repository;
if (repo == null)
return;
repo.SetWatcherEnabled(false);
var treeGuid = new Commands.QueryStagedFileBlobGuid(ctx.RepositoryPath, change.Path).Result();
@ -1025,6 +1026,9 @@ namespace SourceGit.Views
discard.Click += (_, e) =>
{
var repo = repoView.DataContext as ViewModels.Repository;
if (repo == null)
return;
repo.SetWatcherEnabled(false);
var tmpFile = Path.GetTempFileName();

85
src/Views/Welcome.axaml.cs
View file

@ -7,6 +7,7 @@ using Avalonia.Input;
using Avalonia.Interactivity;
using Avalonia.Platform.Storage;
using Avalonia.Threading;
using Avalonia.VisualTree;
namespace SourceGit.Views
{
@ -17,7 +18,7 @@ namespace SourceGit.Views
InitializeComponent();
}
private void SetupTreeViewDragAndDrop(object sender, RoutedEventArgs e)
private void SetupTreeViewDragAndDrop(object sender, RoutedEventArgs _)
{
if (sender is TreeView view)
{
@ -27,7 +28,7 @@ namespace SourceGit.Views
}
}
private void SetupTreeNodeDragAndDrop(object sender, RoutedEventArgs e)
private void SetupTreeNodeDragAndDrop(object sender, RoutedEventArgs _)
{
if (sender is Grid grid)
{
@ -62,7 +63,7 @@ namespace SourceGit.Views
}
}
private void OnPointerReleasedOnTreeNode(object sender, PointerReleasedEventArgs e)
private void OnPointerReleasedOnTreeNode(object _1, PointerReleasedEventArgs _2)
{
_pressedTreeNode = false;
_startDragTreeNode = false;
@ -70,7 +71,8 @@ namespace SourceGit.Views
private void OnPointerMovedOverTreeNode(object sender, PointerEventArgs e)
{
if (_pressedTreeNode && !_startDragTreeNode && sender is Grid grid)
if (_pressedTreeNode && !_startDragTreeNode &&
sender is Grid { DataContext: ViewModels.RepositoryNode node } grid)
{
var delta = e.GetPosition(grid) - _pressedTreeNodePosition;
var sizeSquired = delta.X * delta.X + delta.Y * delta.Y;
@ -80,12 +82,12 @@ namespace SourceGit.Views
_startDragTreeNode = true;
var data = new DataObject();
data.Set("MovedRepositoryTreeNode", grid.DataContext);
data.Set("MovedRepositoryTreeNode", node);
DragDrop.DoDragDrop(e, data, DragDropEffects.Move);
}
}
private void OnTreeViewLostFocus(object sender, RoutedEventArgs e)
private void OnTreeViewLostFocus(object _1, RoutedEventArgs _2)
{
_pressedTreeNode = false;
_startDragTreeNode = false;
@ -107,25 +109,25 @@ namespace SourceGit.Views
private async void DropOnTreeView(object sender, DragEventArgs e)
{
if (e.Data.Contains("MovedRepositoryTreeNode"))
if (e.Data.Get("MovedRepositoryTreeNode") is ViewModels.RepositoryNode moved)
{
e.Handled = true;
var moved = e.Data.Get("MovedRepositoryTreeNode") as ViewModels.RepositoryNode;
if (moved != null && DataContext is ViewModels.Welcome vm)
{
if (DataContext is ViewModels.Welcome vm)
vm.MoveNode(moved, null);
}
}
else if (e.Data.Contains(DataFormats.Files))
{
e.Handled = true;
var items = e.Data.GetFiles();
foreach (var item in items)
if (items != null)
{
await OpenOrInitRepository(item.Path.LocalPath);
break;
foreach (var item in items)
{
await OpenOrInitRepository(item.Path.LocalPath);
break;
}
}
}
@ -160,8 +162,7 @@ namespace SourceGit.Views
private async void DropOnTreeNode(object sender, DragEventArgs e)
{
var grid = sender as Grid;
if (grid == null)
if (sender is not Grid grid)
return;
var to = grid.DataContext as ViewModels.RepositoryNode;
@ -171,25 +172,25 @@ namespace SourceGit.Views
return;
}
if (e.Data.Contains("MovedRepositoryTreeNode"))
if (e.Data.Get("MovedRepositoryTreeNode") is ViewModels.RepositoryNode moved)
{
e.Handled = true;
var moved = e.Data.Get("MovedRepositoryTreeNode") as ViewModels.RepositoryNode;
if (to != null && moved != null && to != moved && DataContext is ViewModels.Welcome vm)
{
if (to != moved && DataContext is ViewModels.Welcome vm)
vm.MoveNode(moved, to);
}
}
else if (e.Data.Contains(DataFormats.Files))
{
e.Handled = true;
var items = e.Data.GetFiles();
foreach (var item in items)
if (items != null)
{
await OpenOrInitRepository(item.Path.LocalPath, to);
break;
foreach (var item in items)
{
await OpenOrInitRepository(item.Path.LocalPath, to);
break;
}
}
}
@ -200,39 +201,36 @@ namespace SourceGit.Views
private void OnDoubleTappedTreeNode(object sender, TappedEventArgs e)
{
var grid = sender as Grid;
if (grid == null)
var to = grid?.DataContext as ViewModels.RepositoryNode;
if (to is not { IsRepository: true })
return;
var to = grid.DataContext as ViewModels.RepositoryNode;
if (to == null || !to.IsRepository)
{
return;
}
var parent = this.FindAncestorOfType<Launcher>();
if (parent?.DataContext is ViewModels.Launcher launcher)
launcher.OpenRepositoryInTab(to, null);
var launcher = TopLevel.GetTopLevel(this).DataContext as ViewModels.Launcher;
launcher.OpenRepositoryInTab(to, launcher.ActivePage);
e.Handled = true;
}
private async void OpenLocalRepository(object sender, RoutedEventArgs e)
private async void OpenLocalRepository(object _1, RoutedEventArgs e)
{
if (!ViewModels.PopupHost.CanCreatePopup())
return;
var topLevel = TopLevel.GetTopLevel(this);
if (topLevel == null)
return;
var options = new FolderPickerOpenOptions() { AllowMultiple = false };
var selected = await topLevel.StorageProvider.OpenFolderPickerAsync(options);
if (selected.Count == 1)
{
await OpenOrInitRepository(selected[0].Path.LocalPath);
}
e.Handled = true;
}
private Task OpenOrInitRepository(string path, ViewModels.RepositoryNode parent = null)
{
var launcher = TopLevel.GetTopLevel(this).DataContext as ViewModels.Launcher;
var page = launcher.ActivePage;
if (!Directory.Exists(path))
{
if (File.Exists(path))
@ -241,15 +239,18 @@ namespace SourceGit.Views
return null;
}
var owner = this.FindAncestorOfType<Launcher>();
var launcher = owner?.DataContext as ViewModels.Launcher;
if (launcher == null)
return null;
var page = launcher.ActivePage;
return Task.Run(() =>
{
var root = new Commands.QueryRepositoryRootPath(path).Result();
if (string.IsNullOrEmpty(root))
{
Dispatcher.UIThread.Invoke(() =>
{
(DataContext as ViewModels.Welcome).InitRepository(path, parent);
});
Dispatcher.UIThread.Invoke(() => (DataContext as ViewModels.Welcome)?.InitRepository(path, parent));
return;
}

8
src/Views/WorkingCopy.axaml.cs
View file

@ -42,7 +42,7 @@ namespace SourceGit.Views
}
}
private void OnUnstagedChangeDoubleTapped(object sender, RoutedEventArgs e)
private void OnUnstagedChangeDoubleTapped(object _, RoutedEventArgs e)
{
if (DataContext is ViewModels.WorkingCopy vm)
{
@ -51,7 +51,7 @@ namespace SourceGit.Views
}
}
private void OnStagedChangeDoubleTapped(object sender, RoutedEventArgs e)
private void OnStagedChangeDoubleTapped(object _, RoutedEventArgs e)
{
if (DataContext is ViewModels.WorkingCopy vm)
{
@ -60,7 +60,7 @@ namespace SourceGit.Views
}
}
private void OnUnstagedKeyDown(object sender, KeyEventArgs e)
private void OnUnstagedKeyDown(object _, KeyEventArgs e)
{
if (DataContext is ViewModels.WorkingCopy vm && e.Key == Key.Space)
{
@ -69,7 +69,7 @@ namespace SourceGit.Views
}
}
private void OnStagedKeyDown(object sender, KeyEventArgs e)
private void OnStagedKeyDown(object _, KeyEventArgs e)
{
if (DataContext is ViewModels.WorkingCopy vm && e.Key == Key.Space)
{