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

feature: change the CONTINUE button to SplitButton to support editing/splitting original commit (#767)

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2024-11-30 19:25:20 +08:00
parent 941ea4a695
commit c1368212df
No known key found for this signature in database
5 changed files with 78 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/Views/WorkingCopy.axaml
View file

@ -243,16 +243,21 @@
Content="{DynamicResource Text.WorkingCopy.Amend}"/>
<v:LoadingIcon Grid.Column="5" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/>
<Button Grid.Column="6"
Classes="flat primary"
Content="{DynamicResource Text.Repository.Continue}"
Height="28"
Margin="8,0,0,0"
Padding="8,0"
Command="{Binding ContinueMerge}"
IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"
IsEnabled="{Binding !HasUnsolvedConflicts}"/>
<SplitButton Grid.Column="6"
Content="{DynamicResource Text.Repository.Continue}"
Height="28"
Margin="8,0,0,0"
Padding="8,0"
Command="{Binding ContinueMerge}"
IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"
IsEnabled="{Binding !HasUnsolvedConflicts}">
<SplitButton.Flyout>
<MenuFlyout>
<MenuItem Header="{DynamicResource Text.WorkingCopy.CommitToEdit}" Command="{Binding Commit}"/>
</MenuFlyout>
</SplitButton.Flyout>
</SplitButton>
<Button Grid.Column="6"
Classes="flat primary"