Skip to content

Commit 13805f7

Browse files
love-lingerlove-linger
committed
Merge branch 'develop'
2 parents 3ee56dd + 79c1fb6 commit 13805f7

11 files changed

+13
-103
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
4848
## Translation Status
4949

50-
[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.56%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.86%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-86.60%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-99.86%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.86%25-yellow)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
50+
[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.70%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-100.00%25-brightgreen)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-86.58%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-100.00%25-brightgreen)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
5151

5252
## How to Use
5353

‎TRANSLATION.md

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
### de_DE.axaml: 98.56%
1+
### de_DE.axaml: 98.70%
22

33

44
<details>
55
<summary>Missing Keys</summary>
66

7-
- Text.CommitDetail.Info.Children
87
- Text.Diff.SaveAsPatch
98
- Text.Diff.VisualLines.All
109
- Text.Hotkeys.Repo.CreateBranchOnCommit
@@ -17,17 +16,17 @@
1716

1817
</details>
1918

20-
### es_ES.axaml: 99.86%
19+
### es_ES.axaml: 100.00%
2120

2221

2322
<details>
2423
<summary>Missing Keys</summary>
2524

26-
- Text.CommitDetail.Info.Children
25+
2726

2827
</details>
2928

30-
### fr_FR.axaml: 86.60%
29+
### fr_FR.axaml: 86.58%
3130

3231

3332
<details>
@@ -129,23 +128,23 @@
129128

130129
</details>
131130

132-
### pt_BR.axaml: 99.86%
131+
### pt_BR.axaml: 100.00%
133132

134133

135134
<details>
136135
<summary>Missing Keys</summary>
137136

138-
- Text.CommitDetail.Info.Children
137+
139138

140139
</details>
141140

142-
### ru_RU.axaml: 99.86%
141+
### ru_RU.axaml: 100.00%
143142

144143

145144
<details>
146145
<summary>Missing Keys</summary>
147146

148-
- Text.CommitDetail.Info.Children
147+
149148

150149
</details>
151150

‎src/Commands/QueryCommitChildren.cs

-34
This file was deleted.

‎src/Resources/Locales/en_US.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
<x:String x:Key="Text.CommitDetail.Info" xml:space="preserve">INFORMATION</x:String>
126126
<x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">AUTHOR</x:String>
127127
<x:String x:Key="Text.CommitDetail.Info.Changed" xml:space="preserve">CHANGED</x:String>
128-
<x:String x:Key="Text.CommitDetail.Info.Children" xml:space="preserve">CHILDREN</x:String>
129128
<x:String x:Key="Text.CommitDetail.Info.Committer" xml:space="preserve">COMMITTER</x:String>
130129
<x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Check refs that contains this commit</x:String>
131130
<x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">COMMIT IS CONTAINED BY</x:String>

‎src/Resources/Locales/fr_FR.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
<x:String x:Key="Text.CommitDetail.Info" xml:space="preserve">INFORMATIONS</x:String>
119119
<x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">AUTEUR</x:String>
120120
<x:String x:Key="Text.CommitDetail.Info.Changed" xml:space="preserve">CHANGÉ</x:String>
121-
<x:String x:Key="Text.CommitDetail.Info.Children" xml:space="preserve">ENFANTS</x:String>
122121
<x:String x:Key="Text.CommitDetail.Info.Committer" xml:space="preserve">COMMITTER</x:String>
123122
<x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">Vérifier les références contenant ce commit</x:String>
124123
<x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">LE COMMIT EST CONTENU PAR</x:String>

‎src/Resources/Locales/zh_CN.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
<x:String x:Key="Text.CommitDetail.Info" xml:space="preserve">基本信息</x:String>
129129
<x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">修改者</x:String>
130130
<x:String x:Key="Text.CommitDetail.Info.Changed" xml:space="preserve">变更列表</x:String>
131-
<x:String x:Key="Text.CommitDetail.Info.Children" xml:space="preserve">子提交</x:String>
132131
<x:String x:Key="Text.CommitDetail.Info.Committer" xml:space="preserve">提交者</x:String>
133132
<x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">查看包含此提交的分支/标签</x:String>
134133
<x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">本提交已被以下分支/标签包含</x:String>

‎src/Resources/Locales/zh_TW.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@
128128
<x:String x:Key="Text.CommitDetail.Info" xml:space="preserve">基本資訊</x:String>
129129
<x:String x:Key="Text.CommitDetail.Info.Author" xml:space="preserve">作者</x:String>
130130
<x:String x:Key="Text.CommitDetail.Info.Changed" xml:space="preserve">變更列表</x:String>
131-
<x:String x:Key="Text.CommitDetail.Info.Children" xml:space="preserve">子提交</x:String>
132131
<x:String x:Key="Text.CommitDetail.Info.Committer" xml:space="preserve">提交者</x:String>
133132
<x:String x:Key="Text.CommitDetail.Info.ContainsIn" xml:space="preserve">檢視包含此提交的分支或標籤</x:String>
134133
<x:String x:Key="Text.CommitDetail.Info.ContainsIn.Title" xml:space="preserve">本提交包含於以下分支或標籤</x:String>

‎src/ViewModels/CommitDetail.cs

-13
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,6 @@ public List<Models.Change> SelectedChanges
7878
}
7979
}
8080

81-
public AvaloniaList<string> Children
82-
{
83-
get;
84-
private set;
85-
} = new AvaloniaList<string>();
86-
8781
public string SearchChangeFilter
8882
{
8983
get => _searchChangeFilter;
@@ -513,7 +507,6 @@ private void Refresh()
513507
VisibleChanges = null;
514508
SelectedChanges = null;
515509
ViewRevisionFileContent = null;
516-
Children.Clear();
517510

518511
if (_commit == null)
519512
return;
@@ -530,12 +523,6 @@ private void Refresh()
530523
Dispatcher.UIThread.Invoke(() => SignInfo = signInfo);
531524
});
532525

533-
Task.Run(() =>
534-
{
535-
var children = new Commands.QueryCommitChildren(_repo.FullPath, _commit.SHA).Result();
536-
Dispatcher.UIThread.Invoke(() => Children.AddRange(children));
537-
});
538-
539526
if (_cancelToken != null)
540527
_cancelToken.Requested = true;
541528

‎src/Views/CommitBaseInfo.axaml

+4-32
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<Rectangle Height=".65" Margin="8" Fill="{DynamicResource Brush.Border2}" VerticalAlignment="Center"/>
5252

5353
<!-- Base Information -->
54-
<Grid RowDefinitions="24,Auto,Auto,Auto,Auto" ColumnDefinitions="96,*">
54+
<Grid RowDefinitions="24,Auto,Auto,Auto" ColumnDefinitions="96,*">
5555
<!-- SHA -->
5656
<TextBlock Grid.Row="0" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.SHA}" />
5757
<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
@@ -122,37 +122,9 @@
122122
</ItemsControl.ItemTemplate>
123123
</ItemsControl>
124124

125-
<!-- CHILDREN -->
126-
<TextBlock Grid.Row="2" Grid.Column="0"
127-
Classes="info_label"
128-
Text="{DynamicResource Text.CommitDetail.Info.Children}"
129-
IsVisible="{Binding #ThisControl.Children.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}"/>
130-
<ItemsControl Grid.Row="2" Grid.Column="1"
131-
Height="24" Margin="12,0,0,0"
132-
ItemsSource="{Binding #ThisControl.Children}"
133-
IsVisible="{Binding #ThisControl.Children.Count, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
134-
<ItemsControl.ItemsPanel>
135-
<ItemsPanelTemplate>
136-
<StackPanel Orientation="Horizontal" VerticalAlignment="Center"/>
137-
</ItemsPanelTemplate>
138-
</ItemsControl.ItemsPanel>
139-
140-
<ItemsControl.ItemTemplate>
141-
<DataTemplate>
142-
<TextBlock Classes="primary"
143-
Text="{Binding Converter={x:Static c:StringConverters.ToShortSHA}}"
144-
Foreground="DarkOrange"
145-
TextDecorations="Underline"
146-
Cursor="Hand"
147-
Margin="0,0,16,0"
148-
PointerPressed="OnSHAPressed"/>
149-
</DataTemplate>
150-
</ItemsControl.ItemTemplate>
151-
</ItemsControl>
152-
153125
<!-- REFS -->
154-
<TextBlock Grid.Row="3" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Refs}" IsVisible="{Binding HasDecorators}"/>
155-
<Border Grid.Row="3" Grid.Column="1" Margin="12,0,0,0" Height="24" IsVisible="{Binding HasDecorators}">
126+
<TextBlock Grid.Row="2" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Refs}" IsVisible="{Binding HasDecorators}"/>
127+
<Border Grid.Row="2" Grid.Column="1" Margin="12,0,0,0" Height="24" IsVisible="{Binding HasDecorators}">
156128
<v:CommitRefsPresenter TagBackground="{DynamicResource Brush.DecoratorTag}"
157129
Foreground="{DynamicResource Brush.FG1}"
158130
FontFamily="{DynamicResource Fonts.Primary}"
@@ -162,7 +134,7 @@
162134
</Border>
163135

164136
<!-- Messages -->
165-
<TextBlock Grid.Row="4" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Message}" VerticalAlignment="Top" Margin="0,4,0,0" />
137+
<TextBlock Grid.Row="3" Grid.Column="0" Classes="info_label" Text="{DynamicResource Text.CommitDetail.Info.Message}" VerticalAlignment="Top" Margin="0,4,0,0" />
166138
<v:CommitMessagePresenter Grid.Row="4" Grid.Column="1"
167139
Margin="12,5,8,0"
168140
Classes="primary"

‎src/Views/CommitBaseInfo.axaml.cs

-9
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ public AvaloniaList<Models.IssueTrackerRule> IssueTrackerRules
5353
set => SetValue(IssueTrackerRulesProperty, value);
5454
}
5555

56-
public static readonly StyledProperty<AvaloniaList<string>> ChildrenProperty =
57-
AvaloniaProperty.Register<CommitBaseInfo, AvaloniaList<string>>(nameof(Children));
58-
59-
public AvaloniaList<string> Children
60-
{
61-
get => GetValue(ChildrenProperty);
62-
set => SetValue(ChildrenProperty, value);
63-
}
64-
6556
public CommitBaseInfo()
6657
{
6758
InitializeComponent();

‎src/Views/CommitDetail.axaml

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
SignInfo="{Binding SignInfo}"
2525
SupportsContainsIn="True"
2626
WebLinks="{Binding WebLinks}"
27-
Children="{Binding Children}"
2827
IssueTrackerRules="{Binding IssueTrackerRules}"/>
2928

3029
<!-- Line -->

0 commit comments

Comments
 (0)