dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-20 11:44:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: notification popup uses the same text presenter with git command log viewer (#1149)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-04-17 18:21:55 +08:00
parent 231010abc6
commit 090b64d68d
No known key found for this signature in database
4 changed files with 159 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

152
src/Views/CommandLogContentPresenter.cs Normal file
View file

@ -0,0 +1,152 @@
using System;
using System.Collections.Generic;
using Avalonia;
using Avalonia.Controls.Primitives;
using Avalonia.Interactivity;
using Avalonia.Media;
using AvaloniaEdit;
using AvaloniaEdit.Document;
using AvaloniaEdit.Editing;
using AvaloniaEdit.Rendering;
using AvaloniaEdit.TextMate;
namespace SourceGit.Views
{
public class CommandLogContentPresenter : TextEditor
{
public class LineStyleTransformer : DocumentColorizingTransformer
{
protected override void ColorizeLine(DocumentLine line)
{
var content = CurrentContext.Document.GetText(line);
if (content.StartsWith("$ git ", StringComparison.Ordinal))
{
ChangeLinePart(line.Offset, line.Offset + 1, v =>
{
v.TextRunProperties.SetForegroundBrush(Brushes.Orange);
});
ChangeLinePart(line.Offset + 2, line.EndOffset, v =>
{
var old = v.TextRunProperties.Typeface;
v.TextRunProperties.SetTypeface(new Typeface(old.FontFamily, old.Style, FontWeight.Bold));
});
}
else if (content.StartsWith("remote: ", StringComparison.Ordinal))
{
ChangeLinePart(line.Offset, line.Offset + 7, v =>
{
v.TextRunProperties.SetForegroundBrush(Brushes.SeaGreen);
});
}
else
{
foreach (var err in _errors)
{
var idx = content.IndexOf(err, StringComparison.Ordinal);
if (idx >= 0)
{
ChangeLinePart(line.Offset + idx, line.Offset + err.Length + 1, v =>
{
v.TextRunProperties.SetForegroundBrush(Brushes.Red);
});
}
}
}
}
private readonly List<string> _errors = ["! [rejected]", "! [remote rejected]"];
}
public static readonly StyledProperty<ViewModels.CommandLog> LogProperty =
AvaloniaProperty.Register<CommandLogContentPresenter, ViewModels.CommandLog>(nameof(Log));
public ViewModels.CommandLog Log
{
get => GetValue(LogProperty);
set => SetValue(LogProperty, value);
}
public static readonly StyledProperty<string> PureTextProperty =
AvaloniaProperty.Register<CommandLogContentPresenter, string>(nameof(PureText));
public string PureText
{
get => GetValue(PureTextProperty);
set => SetValue(PureTextProperty, value);
}
protected override Type StyleKeyOverride => typeof(TextEditor);
public CommandLogContentPresenter() : base(new TextArea(), new TextDocument())
{
IsReadOnly = true;
ShowLineNumbers = false;
WordWrap = false;
HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
TextArea.TextView.Margin = new Thickness(4, 0);
TextArea.TextView.Options.EnableHyperlinks = false;
TextArea.TextView.Options.EnableEmailHyperlinks = false;
}
protected override void OnLoaded(RoutedEventArgs e)
{
base.OnLoaded(e);
if (_textMate == null)
{
_textMate = Models.TextMateHelper.CreateForEditor(this);
Models.TextMateHelper.SetGrammarByFileName(_textMate, "Log.log");
TextArea.TextView.LineTransformers.Add(new LineStyleTransformer());
}
}
protected override void OnUnloaded(RoutedEventArgs e)
{
base.OnUnloaded(e);
if (_textMate != null)
{
_textMate.Dispose();
_textMate = null;
}
GC.Collect();
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
if (change.Property == LogProperty)
{
if (change.NewValue is ViewModels.CommandLog log)
{
Text = log.Content;
log.Register(OnLogLineReceived);
}
else
{
Text = string.Empty;
}
}
else if (change.Property == PureTextProperty)
{
if (!string.IsNullOrEmpty(PureText))
Text = PureText;
}
}
private void OnLogLineReceived(string newline)
{
AppendText("\n");
AppendText(newline);
}
private TextMate.Installation _textMate = null;
}
}

8
src/Views/LauncherPage.axaml
View file

@ -141,9 +141,11 @@
</Button> </Button>
</Grid> </Grid>
<ScrollViewer Grid.Row="1" Margin="8" MaxHeight="200" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"> <v:CommandLogContentPresenter Grid.Row="1"
<TextBlock Margin="4,2" TextWrapping="Wrap" Text="{Binding Message}"/> Margin="8"
</ScrollViewer> Padding="2"
MaxHeight="200"
PureText="{Binding Message}"/>
</Grid> </Grid>
</Border> </Border>
</Border> </Border>

4
src/Views/ViewLogs.axaml
View file

@ -100,8 +100,8 @@
BorderBrush="{DynamicResource Brush.Border2}" BorderBrush="{DynamicResource Brush.Border2}"
BorderThickness="1" BorderThickness="1"
Background="{DynamicResource Brush.Contents}"> Background="{DynamicResource Brush.Contents}">
<v:LogContentPresenter Log="{Binding SelectedLog}" <v:CommandLogContentPresenter Log="{Binding SelectedLog}"
FontFamily="{DynamicResource Fonts.Monospace}"/> FontFamily="{DynamicResource Fonts.Monospace}"/>
</Border> </Border>
</Grid> </Grid>

111
src/Views/ViewLogs.axaml.cs
View file

@ -1,118 +1,7 @@
using System;
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.Interactivity;
using Avalonia.Media;
using AvaloniaEdit;
using AvaloniaEdit.Document;
using AvaloniaEdit.Editing;
using AvaloniaEdit.Rendering;
using AvaloniaEdit.TextMate;
namespace SourceGit.Views namespace SourceGit.Views
{ {
public class LogContentPresenter : TextEditor
{
public class LineStyleTransformer : DocumentColorizingTransformer
{
protected override void ColorizeLine(DocumentLine line)
{
var content = CurrentContext.Document.GetText(line);
if (content.StartsWith("$ git ", StringComparison.Ordinal))
{
ChangeLinePart(line.Offset, line.Offset + 1, v =>
{
v.TextRunProperties.SetForegroundBrush(Brushes.Orange);
});
ChangeLinePart(line.Offset + 2, line.EndOffset, v =>
{
var old = v.TextRunProperties.Typeface;
v.TextRunProperties.SetTypeface(new Typeface(old.FontFamily, old.Style, FontWeight.Bold));
});
}
}
}
public static readonly StyledProperty<ViewModels.CommandLog> LogProperty =
AvaloniaProperty.Register<LogContentPresenter, ViewModels.CommandLog>(nameof(Log));
public ViewModels.CommandLog Log
{
get => GetValue(LogProperty);
set => SetValue(LogProperty, value);
}
protected override Type StyleKeyOverride => typeof(TextEditor);
public LogContentPresenter() : base(new TextArea(), new TextDocument())
{
IsReadOnly = true;
ShowLineNumbers = false;
WordWrap = false;
HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
TextArea.TextView.Margin = new Thickness(4, 0);
TextArea.TextView.Options.EnableHyperlinks = false;
TextArea.TextView.Options.EnableEmailHyperlinks = false;
}
protected override void OnLoaded(RoutedEventArgs e)
{
base.OnLoaded(e);
if (_textMate == null)
{
_textMate = Models.TextMateHelper.CreateForEditor(this);
Models.TextMateHelper.SetGrammarByFileName(_textMate, "Log.log");
TextArea.TextView.LineTransformers.Add(new LineStyleTransformer());
}
}
protected override void OnUnloaded(RoutedEventArgs e)
{
base.OnUnloaded(e);
if (_textMate != null)
{
_textMate.Dispose();
_textMate = null;
}
GC.Collect();
}
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
{
base.OnPropertyChanged(change);
if (change.Property == LogProperty)
{
if (change.NewValue is ViewModels.CommandLog log)
{
Text = log.Content;
log.Register(OnLogLineReceived);
}
else
{
Text = string.Empty;
}
}
}
private void OnLogLineReceived(string newline)
{
AppendText("\n");
AppendText(newline);
}
private TextMate.Installation _textMate = null;
}
public partial class ViewLogs : ChromelessWindow public partial class ViewLogs : ChromelessWindow
{ {
public ViewLogs() public ViewLogs()