From 8a95a17b0eeaa2fdf76bd8344be42dc0168f215b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 21 Nov 2024 20:55:59 +0800
Subject: [PATCH] ux: re-order menu items

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml |  2 +-
 src/ViewModels/Histories.cs       | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

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 @@
   <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Enable '--reflog' Option</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Open in File Browser</x:String>
   <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Search Branches/Tags/Submodules</x:String>
-  <x:String x:Key="Text.Repository.FilterCommits" xml:space="preserve">Visibility in Graph</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits" xml:space="preserve">Set visibility</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Unset</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Hide in commit graph</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Filter in commit graph</x:String>
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");