From ba24eede11f8fcce89b989870320fbe95a053585 Mon Sep 17 00:00:00 2001 From: Simon Cropp Date: Thu, 18 Jul 2024 19:37:04 +1000 Subject: [PATCH] Update MenuBuilder.cs --- src/DiffEngineTray/MenuBuilder.cs | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/src/DiffEngineTray/MenuBuilder.cs b/src/DiffEngineTray/MenuBuilder.cs index a42c23b3..4d99561a 100644 --- a/src/DiffEngineTray/MenuBuilder.cs +++ b/src/DiffEngineTray/MenuBuilder.cs @@ -87,7 +87,10 @@ static IEnumerable BuildTrackingMenuItems(Tracker tracker) yield return new MenuButton($"Accept all ({count})", tracker.AcceptAll, Images.AcceptAll); } - static IEnumerable BuildGroupedMenuItems(Tracker tracker, List deletes, List moves) + static IEnumerable BuildGroupedMenuItems( + Tracker tracker, + List deletes, + List moves) { var groups = deletes.Select(_ => _.Group) .Concat(moves.Select(_ => _.Group)) @@ -114,7 +117,11 @@ static IEnumerable BuildGroupedMenuItems(Tracker tracker, List BuildMovesAndDeletes(string? name, Tracker tracker, List deletes, List moves) + static IEnumerable BuildMovesAndDeletes( + string? name, + Tracker tracker, + List deletes, + List moves) { if (name != null) { @@ -123,7 +130,10 @@ static IEnumerable BuildMovesAndDeletes(string? name, Tracker tra if (deletes.Count != 0) { - yield return new MenuButton($"Pending Deletes ({deletes.Count}):", () => tracker.Accept(deletes), Images.Delete); + yield return new MenuButton( + $"Pending Deletes ({deletes.Count}):", + () => tracker.Accept(deletes), + Images.Delete); foreach (var delete in deletes) { yield return BuildDelete(delete, () => tracker.Accept(delete)); @@ -132,7 +142,10 @@ static IEnumerable BuildMovesAndDeletes(string? name, Tracker tra if (moves.Count != 0) { - yield return new MenuButton($"Pending Moves ({moves.Count}):", () => tracker.Accept(moves), Images.Accept); + yield return new MenuButton( + $"Pending Moves ({moves.Count}):", + () => tracker.Accept(moves), + Images.Accept); foreach (var move in moves) { yield return BuildMove( @@ -147,8 +160,10 @@ static IEnumerable BuildMovesAndDeletes(string? name, Tracker tra static ToolStripItem BuildDelete(TrackedDelete delete, Action accept) { - var menu = new ToolStripDropDownButton($"{delete.Name}"); - menu.DropDownDirection = ToolStripDropDownDirection.Left; + var menu = new ToolStripDropDownButton($"{delete.Name}") + { + DropDownDirection = ToolStripDropDownDirection.Left + }; menu.DropDownItems.Add(new MenuButton("Accept delete", accept)); menu.DropDownItems.Add(BuildShowInExplorer(delete.File)); return menu;