github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-21 13:20:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

ux: add a RESOLVE button in InProgress banner (#2053)

Browse Source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo
2026-01-20 11:15:28 +08:00
parent 79f6eed1ca
commit 792c0b640f
5 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Resources/Locales/en_US.axaml
View File

@@ -737,6 +737,7 @@
<x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">Open in External Tools</x:String>
<x:String x:Key="Text.Repository.Remotes" xml:space="preserve">REMOTES</x:String>
<x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">Add Remote</x:String>
<x:String x:Key="Text.Repository.Resolve" xml:space="preserve">RESOLVE</x:String>
<x:String x:Key="Text.Repository.Search" xml:space="preserve">Search Commit</x:String>
<x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">Author</x:String>
<x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">Committer</x:String>

1
src/Resources/Locales/zh_CN.axaml
View File

@@ -741,6 +741,7 @@
<x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">使用外部工具打开</x:String>
<x:String x:Key="Text.Repository.Remotes" xml:space="preserve">远程列表</x:String>
<x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">添加远程</x:String>
<x:String x:Key="Text.Repository.Resolve" xml:space="preserve">解决冲突</x:String>
<x:String x:Key="Text.Repository.Search" xml:space="preserve">查找提交</x:String>
<x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">作者</x:String>
<x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">提交者</x:String>

1
src/Resources/Locales/zh_TW.axaml
View File

@@ -741,6 +741,7 @@
<x:String x:Key="Text.Repository.OpenWithExternalTools" xml:space="preserve">使用外部工具開啟</x:String>
<x:String x:Key="Text.Repository.Remotes" xml:space="preserve">遠端列表</x:String>
<x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">新增遠端</x:String>
<x:String x:Key="Text.Repository.Resolve" xml:space="preserve">解決衝突</x:String>
<x:String x:Key="Text.Repository.Search" xml:space="preserve">搜尋提交</x:String>
<x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">作者</x:String>
<x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">提交者</x:String>

11
src/Views/Repository.axaml
View File

@@ -636,7 +636,7 @@
<!-- Right -->
<Grid Grid.Column="2" RowDefinitions="Auto,Auto,Auto,*">
<Grid Grid.Row="0" Height="28" ColumnDefinitions="*,Auto" Background="{DynamicResource Brush.Conflict}" IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}">
<Grid Grid.Row="0" Height="28" ColumnDefinitions="*,Auto,Auto" Background="{DynamicResource Brush.Conflict}" IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}">
<ContentControl Grid.Column="0" Margin="8,0" Content="{Binding InProgressContext}">
<ContentControl.DataTemplates>
<DataTemplate DataType="m:Commit">
@@ -707,6 +707,15 @@
</ContentControl>
<Button Grid.Column="1"
Classes="flat"
FontWeight="Regular"
BorderThickness="0"
Content="{DynamicResource Text.Repository.Resolve}"
Padding="8,2" Margin="0,0,8,0"
Click="OnResolveInProgress"
IsVisible="{Binding SelectedViewIndex, Converter={x:Static c:IntConverters.IsNotOne}}"/>
<Button Grid.Column="2"
Classes="flat"
FontWeight="Regular"
BorderThickness="0"

8
src/Views/Repository.axaml.cs
View File

@@ -573,6 +573,14 @@ namespace SourceGit.Views
e.Handled = true;
}
private void OnResolveInProgress(object sender, RoutedEventArgs e)
{
if (DataContext is ViewModels.Repository repo)
repo.SelectedViewIndex = 1;
e.Handled = true;
}
private async void OnAbortInProgress(object sender, RoutedEventArgs e)
{
if (DataContext is ViewModels.Repository repo)