Skip to content

Commit f2778ee

Browse files
authored
ux: hotkey tag on external merger menu items (#1547)
1 parent 170308e commit f2778ee

File tree

5 files changed

+6
-0
lines changed

5 files changed

+6
-0
lines changed

src/ViewModels/BranchCompare.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ public ContextMenu CreateChangeContextMenu()
125125
var openWithMerger = new MenuItem();
126126
openWithMerger.Header = App.Text("OpenInExternalMergeTool");
127127
openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
128+
openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
128129
openWithMerger.Click += (_, ev) =>
129130
{
130131
var toolType = Preferences.Instance.ExternalMergeToolType;

src/ViewModels/CommitDetail.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@ public ContextMenu CreateChangeContextMenu(Models.Change change)
325325
var openWithMerger = new MenuItem();
326326
openWithMerger.Header = App.Text("OpenInExternalMergeTool");
327327
openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
328+
openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
328329
openWithMerger.Click += (_, ev) =>
329330
{
330331
var toolType = Preferences.Instance.ExternalMergeToolType;

src/ViewModels/RevisionCompare.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ public ContextMenu CreateChangeContextMenu()
139139
var openWithMerger = new MenuItem();
140140
openWithMerger.Header = App.Text("OpenInExternalMergeTool");
141141
openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
142+
openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
142143
openWithMerger.Click += (_, ev) =>
143144
{
144145
var opt = new Models.DiffOption(GetSHA(_startPoint), GetSHA(_endPoint), change);

src/ViewModels/StashesPage.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ public ContextMenu MakeContextMenuForChange()
226226
var openWithMerger = new MenuItem();
227227
openWithMerger.Header = App.Text("OpenInExternalMergeTool");
228228
openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
229+
openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
229230
openWithMerger.Click += (_, ev) =>
230231
{
231232
var toolType = Preferences.Instance.ExternalMergeToolType;

src/ViewModels/WorkingCopy.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,7 @@ public ContextMenu CreateContextMenuForUnstagedChanges(string selectedSingleFold
587587
var openMerger = new MenuItem();
588588
openMerger.Header = App.Text("OpenInExternalMergeTool");
589589
openMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
590+
openMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
590591
openMerger.Click += async (_, e) =>
591592
{
592593
if (change.IsConflicted)
@@ -1275,6 +1276,7 @@ public ContextMenu CreateContextMenuForStagedChanges(string selectedSingleFolder
12751276
var openWithMerger = new MenuItem();
12761277
openWithMerger.Header = App.Text("OpenInExternalMergeTool");
12771278
openWithMerger.Icon = App.CreateMenuIcon("Icons.OpenWith");
1279+
openWithMerger.Tag = OperatingSystem.IsMacOS() ? "⌘+⇧+D" : "Ctrl+Shift+D";
12781280
openWithMerger.Click += (_, ev) =>
12791281
{
12801282
var toolType = Preferences.Instance.ExternalMergeToolType;

0 commit comments

Comments
 (0)