From f2778ee07a9cfd39796ed66da8ea9bf2aa4c23b5 Mon Sep 17 00:00:00 2001 From: Nathan Baulch Date: Tue, 8 Jul 2025 18:30:49 +1000 Subject: [PATCH] ux: hotkey tag on external merger menu items (#1547) --- src/ViewModels/BranchCompare.cs | 1 + src/ViewModels/CommitDetail.cs | 1 + src/ViewModels/RevisionCompare.cs | 1 + src/ViewModels/StashesPage.cs | 1 + src/ViewModels/WorkingCopy.cs | 2 ++ 5 files changed, 6 insertions(+) diff --git a/src/ViewModels/BranchCompare.cs b/src/ViewModels/BranchCompare.cs index 914d1e0c..708761f0 100644 --- a/src/ViewModels/BranchCompare.cs +++ b/src/ViewModels/BranchCompare.cs @@ -125,6 +125,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; diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs index 790c656c..085f0aab 100644 --- a/src/ViewModels/CommitDetail.cs +++ b/src/ViewModels/CommitDetail.cs @@ -325,6 +325,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; diff --git a/src/ViewModels/RevisionCompare.cs b/src/ViewModels/RevisionCompare.cs index 6de99d88..a7bb03d3 100644 --- a/src/ViewModels/RevisionCompare.cs +++ b/src/ViewModels/RevisionCompare.cs @@ -139,6 +139,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 opt = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), change); diff --git a/src/ViewModels/StashesPage.cs b/src/ViewModels/StashesPage.cs index 9fbb5582..2ebe6354 100644 --- a/src/ViewModels/StashesPage.cs +++ b/src/ViewModels/StashesPage.cs @@ -226,6 +226,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; diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs index 493ec927..ccac01a7 100644 --- a/src/ViewModels/WorkingCopy.cs +++ b/src/ViewModels/WorkingCopy.cs @@ -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;