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

ux: hotkey tag on external merger menu items (#1547)

Browse Source
This commit is contained in:
Nathan Baulch
2025-07-08 18:30:49 +10:00
committed by GitHub
parent 170308e84f
commit f2778ee07a
5 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ViewModels/WorkingCopy.cs
View File

@@ -587,6 +587,7 @@ namespace SourceGit.ViewModels
var openMerger = new MenuItem();
openMerger.Header = App.Text("OpenInExternalMergeTool");
openMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
openMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
openMerger.Click += async (_, e) =>
{
if (change.IsConflicted)
@@ -1275,6 +1276,7 @@ namespace SourceGit.ViewModels
var openWithMerger = new MenuItem();
openWithMerger.Header = App.Text("OpenInExternalMergeTool");
openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
openWithMerger.Click += (_, ev) =>
{
var toolType = Preferences.Instance.ExternalMergeToolType;