diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml index 705d7c6f..6ff69ba9 100644 --- a/src/Resources/Locales/en_US.axaml +++ b/src/Resources/Locales/en_US.axaml @@ -542,7 +542,7 @@ Enable '--reflog' Option Open in File Browser Search Branches/Tags/Submodules - Visibility in Graph + Set visibility Unset Hide in commit graph Filter in commit graph diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs index 92524f62..2bbe83bb 100644 --- a/src/ViewModels/Histories.cs +++ b/src/ViewModels/Histories.cs @@ -812,8 +812,6 @@ namespace SourceGit.ViewModels submenu.Icon = App.CreateMenuIcon("Icons.Branch"); submenu.Header = current.Name; - FillBranchVisibilityMenu(submenu, current); - if (!string.IsNullOrEmpty(current.Upstream)) { var upstream = current.Upstream.Substring(13); @@ -871,6 +869,8 @@ namespace SourceGit.ViewModels submenu.Items.Add(new MenuItem() { Header = "-" }); } + FillBranchVisibilityMenu(submenu, current); + var rename = new MenuItem(); rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", current.Name); rename.Icon = App.CreateMenuIcon("Icons.Rename"); @@ -891,8 +891,6 @@ namespace SourceGit.ViewModels submenu.Icon = App.CreateMenuIcon("Icons.Branch"); submenu.Header = branch.Name; - FillBranchVisibilityMenu(submenu, branch); - var checkout = new MenuItem(); checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", branch.Name); checkout.Icon = App.CreateMenuIcon("Icons.Check"); @@ -932,6 +930,8 @@ namespace SourceGit.ViewModels submenu.Items.Add(new MenuItem() { Header = "-" }); } + FillBranchVisibilityMenu(submenu, branch); + var rename = new MenuItem(); rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name); rename.Icon = App.CreateMenuIcon("Icons.Rename"); @@ -965,8 +965,6 @@ namespace SourceGit.ViewModels submenu.Icon = App.CreateMenuIcon("Icons.Branch"); submenu.Header = name; - FillBranchVisibilityMenu(submenu, branch); - var checkout = new MenuItem(); checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", name); checkout.Icon = App.CreateMenuIcon("Icons.Check"); @@ -991,6 +989,8 @@ namespace SourceGit.ViewModels submenu.Items.Add(merge); submenu.Items.Add(new MenuItem() { Header = "-" }); + FillBranchVisibilityMenu(submenu, branch); + var delete = new MenuItem(); delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", name); delete.Icon = App.CreateMenuIcon("Icons.Clear"); @@ -1012,8 +1012,6 @@ namespace SourceGit.ViewModels submenu.Icon = App.CreateMenuIcon("Icons.Tag"); submenu.MinWidth = 200; - FillTagVisibilityMenu(submenu, tag); - var push = new MenuItem(); push.Header = new Views.NameHighlightedTextBlock("TagCM.Push", tag.Name); push.Icon = App.CreateMenuIcon("Icons.Push"); @@ -1039,6 +1037,8 @@ namespace SourceGit.ViewModels submenu.Items.Add(merge); submenu.Items.Add(new MenuItem() { Header = "-" }); + FillTagVisibilityMenu(submenu, tag); + var delete = new MenuItem(); delete.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name); delete.Icon = App.CreateMenuIcon("Icons.Clear");