From 28b6ce49936402eda7479971334370a44a3d8496 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 2 Sep 2024 10:51:48 +0800
Subject: [PATCH 01/21] enhance: save preference.json instantly

---
 src/App.axaml.cs              |  1 -
 src/ViewModels/Preference.cs  | 40 ++++++++++++++++++++++++++++++++++-
 src/Views/Preference.axaml.cs |  6 ++++--
 3 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 98d671d3..ffce8a51 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -522,7 +522,6 @@ namespace SourceGit
             var pref = ViewModels.Preference.Instance;
             if (pref.ShouldCheck4UpdateOnStartup())
             {
-                pref.Save();
                 Check4Update();
             }
         }
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
index ed3c0724..afe40cf5 100644
--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preference.cs
@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-
+using System.Threading;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -414,10 +416,44 @@ namespace SourceGit.ViewModels
 
         public void Save()
         {
+            lock (_saveCtsLock)
+            {
+                _saveCts.Cancel();
+                _saveCts = new CancellationTokenSource();
+            }
             var data = JsonSerializer.Serialize(this, JsonCodeGen.Default.Preference);
             File.WriteAllText(_savePath, data);
         }
 
+        public async Task SaveAsync()
+        {
+            lock (_saveCtsLock)
+            {
+                _saveCts.Cancel();
+                _saveCts = new CancellationTokenSource();
+            }
+
+            try
+            {
+                await Task.Delay(3000, _saveCts.Token);
+            }
+            catch (TaskCanceledException)
+            {
+                return;
+            }
+
+            var data = JsonSerializer.Serialize(this, JsonCodeGen.Default.Preference);
+            await File.WriteAllTextAsync(_savePath, data);
+        }
+
+        protected override void OnPropertyChanged(PropertyChangedEventArgs e)
+        {
+            base.OnPropertyChanged(e);
+#pragma warning disable CS4014
+            SaveAsync();
+#pragma warning restore CS4014
+        }
+
         private RepositoryNode FindNodeRecursive(string id, List<RepositoryNode> collection)
         {
             foreach (var node in collection)
@@ -468,6 +504,8 @@ namespace SourceGit.ViewModels
         private static Preference _instance = null;
         private static bool _isLoading = false;
         private static readonly string _savePath = Path.Combine(Native.OS.DataDir, "preference.json");
+        private static CancellationTokenSource _saveCts = new();
+        private static readonly object _saveCtsLock = new();
 
         private string _locale = "en_US";
         private string _theme = "Default";
diff --git a/src/Views/Preference.axaml.cs b/src/Views/Preference.axaml.cs
index 2621bcaf..6fedd052 100644
--- a/src/Views/Preference.axaml.cs
+++ b/src/Views/Preference.axaml.cs
@@ -138,7 +138,7 @@ namespace SourceGit.Views
 
             if (!GPGFormat.Value.Equals("ssh", StringComparison.Ordinal))
                 SetIfChanged(config, $"gpg.{GPGFormat.Value}.program", GPGExecutableFile);
-            
+
             base.OnClosing(e);
         }
 
@@ -261,7 +261,9 @@ namespace SourceGit.Views
             if (sender is CheckBox box)
             {
                 ViewModels.Preference.Instance.UseSystemWindowFrame = box.IsChecked == true;
-                ViewModels.Preference.Instance.Save();
+#pragma warning disable CS4014
+                ViewModels.Preference.Instance.SaveAsync();
+#pragma warning restore CS4014
 
                 var dialog = new ConfirmRestart();
                 App.OpenDialog(dialog);

From c85293c86a247fe0bde5c3ba28a02755fdc4fb03 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Mon, 2 Sep 2024 12:05:24 +0800
Subject: [PATCH 02/21] enhance: support save RepositoryNode changes instantly

---
 src/App.axaml.cs              |  6 ++++++
 src/ViewModels/Preference.cs  | 17 +++++++++--------
 src/Views/Preference.axaml.cs |  3 ---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index ffce8a51..c6ae4513 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -75,6 +75,12 @@ namespace SourceGit
             AvaloniaXamlLoader.Load(this);
 
             var pref = ViewModels.Preference.Instance;
+            pref.PropertyChanged += (_1, _2) =>
+            {
+#pragma warning disable CS4014
+                pref.SaveAsync();
+#pragma warning restore CS4014
+            };
             SetLocale(pref.Locale);
             SetTheme(pref.Theme, pref.ThemeOverrides);
             SetFonts(pref.DefaultFontFamily, pref.MonospaceFontFamily, pref.OnlyUseMonoFontInEditor);
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
index afe40cf5..a7aa6532 100644
--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preference.cs
@@ -356,6 +356,9 @@ namespace SourceGit.ViewModels
 
                 return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
             });
+#pragma warning disable CS4014
+            SaveAsync();
+#pragma warning restore CS4014
         }
 
         public RepositoryNode FindNode(string id)
@@ -400,6 +403,9 @@ namespace SourceGit.ViewModels
         public void RemoveNode(RepositoryNode node)
         {
             RemoveNodeRecursive(node, RepositoryNodes);
+#pragma warning disable CS4014
+            SaveAsync();
+#pragma warning restore CS4014
         }
 
         public void SortByRenamedNode(RepositoryNode node)
@@ -412,6 +418,9 @@ namespace SourceGit.ViewModels
 
                 return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
             });
+#pragma warning disable CS4014
+            SaveAsync();
+#pragma warning restore CS4014
         }
 
         public void Save()
@@ -446,14 +455,6 @@ namespace SourceGit.ViewModels
             await File.WriteAllTextAsync(_savePath, data);
         }
 
-        protected override void OnPropertyChanged(PropertyChangedEventArgs e)
-        {
-            base.OnPropertyChanged(e);
-#pragma warning disable CS4014
-            SaveAsync();
-#pragma warning restore CS4014
-        }
-
         private RepositoryNode FindNodeRecursive(string id, List<RepositoryNode> collection)
         {
             foreach (var node in collection)
diff --git a/src/Views/Preference.axaml.cs b/src/Views/Preference.axaml.cs
index 6fedd052..25dbfd96 100644
--- a/src/Views/Preference.axaml.cs
+++ b/src/Views/Preference.axaml.cs
@@ -261,9 +261,6 @@ namespace SourceGit.Views
             if (sender is CheckBox box)
             {
                 ViewModels.Preference.Instance.UseSystemWindowFrame = box.IsChecked == true;
-#pragma warning disable CS4014
-                ViewModels.Preference.Instance.SaveAsync();
-#pragma warning restore CS4014
 
                 var dialog = new ConfirmRestart();
                 App.OpenDialog(dialog);

From 9fe8ffcea933a74323fcf039c2f6047cb9f945c7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 2 Sep 2024 12:20:11 +0800
Subject: [PATCH 03/21] code_review: PR #436

It's ok to call `Save()` multiple times after property of `ViewModels.Preference` changed immediately. If we delay the saving operation 3 seconds after the property changed event, we reduce the times calling `Save`, but the issue metioned in #436 may still exists.
---
 src/App.axaml.cs             | 10 ++----
 src/ViewModels/Preference.cs | 62 ++++++++++--------------------------
 2 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index c6ae4513..f4ec6a11 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -75,12 +75,8 @@ namespace SourceGit
             AvaloniaXamlLoader.Load(this);
 
             var pref = ViewModels.Preference.Instance;
-            pref.PropertyChanged += (_1, _2) =>
-            {
-#pragma warning disable CS4014
-                pref.SaveAsync();
-#pragma warning restore CS4014
-            };
+            pref.PropertyChanged += (_1, _2) => pref.Save();
+
             SetLocale(pref.Locale);
             SetTheme(pref.Theme, pref.ThemeOverrides);
             SetFonts(pref.DefaultFontFamily, pref.MonospaceFontFamily, pref.OnlyUseMonoFontInEditor);
@@ -527,9 +523,7 @@ namespace SourceGit
 
             var pref = ViewModels.Preference.Instance;
             if (pref.ShouldCheck4UpdateOnStartup())
-            {
                 Check4Update();
-            }
         }
 
         private ViewModels.Launcher _launcher = null;
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
index a7aa6532..3badb359 100644
--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preference.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
+
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -155,9 +153,9 @@ namespace SourceGit.ViewModels
 
         public string IgnoreUpdateTag
         {
-            get;
-            set;
-        } = string.Empty;
+            get => _ignoreUpdateTag;
+            set => SetProperty(ref _ignoreUpdateTag, value);
+        }
 
         public bool ShowTagsAsTree
         {
@@ -320,9 +318,9 @@ namespace SourceGit.ViewModels
 
         public double LastCheckUpdateTime
         {
-            get;
-            set;
-        } = 0;
+            get => _lastCheckUpdateTime;
+            set => SetProperty(ref _lastCheckUpdateTime, value);
+        }
 
         public bool IsGitConfigured()
         {
@@ -356,9 +354,8 @@ namespace SourceGit.ViewModels
 
                 return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
             });
-#pragma warning disable CS4014
-            SaveAsync();
-#pragma warning restore CS4014
+
+            Save();
         }
 
         public RepositoryNode FindNode(string id)
@@ -398,14 +395,13 @@ namespace SourceGit.ViewModels
 
             RemoveNode(node);
             AddNode(node, to);
+            Save();
         }
 
         public void RemoveNode(RepositoryNode node)
         {
             RemoveNodeRecursive(node, RepositoryNodes);
-#pragma warning disable CS4014
-            SaveAsync();
-#pragma warning restore CS4014
+            Save();
         }
 
         public void SortByRenamedNode(RepositoryNode node)
@@ -418,43 +414,16 @@ namespace SourceGit.ViewModels
 
                 return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
             });
-#pragma warning disable CS4014
-            SaveAsync();
-#pragma warning restore CS4014
+
+            Save();
         }
 
         public void Save()
         {
-            lock (_saveCtsLock)
-            {
-                _saveCts.Cancel();
-                _saveCts = new CancellationTokenSource();
-            }
             var data = JsonSerializer.Serialize(this, JsonCodeGen.Default.Preference);
             File.WriteAllText(_savePath, data);
         }
 
-        public async Task SaveAsync()
-        {
-            lock (_saveCtsLock)
-            {
-                _saveCts.Cancel();
-                _saveCts = new CancellationTokenSource();
-            }
-
-            try
-            {
-                await Task.Delay(3000, _saveCts.Token);
-            }
-            catch (TaskCanceledException)
-            {
-                return;
-            }
-
-            var data = JsonSerializer.Serialize(this, JsonCodeGen.Default.Preference);
-            await File.WriteAllTextAsync(_savePath, data);
-        }
-
         private RepositoryNode FindNodeRecursive(string id, List<RepositoryNode> collection)
         {
             foreach (var node in collection)
@@ -505,8 +474,6 @@ namespace SourceGit.ViewModels
         private static Preference _instance = null;
         private static bool _isLoading = false;
         private static readonly string _savePath = Path.Combine(Native.OS.DataDir, "preference.json");
-        private static CancellationTokenSource _saveCts = new();
-        private static readonly object _saveCtsLock = new();
 
         private string _locale = "en_US";
         private string _theme = "Default";
@@ -522,7 +489,10 @@ namespace SourceGit.ViewModels
         private int _subjectGuideLength = 50;
         private bool _restoreTabs = false;
         private bool _useFixedTabWidth = true;
+
         private bool _check4UpdatesOnStartup = true;
+        private double _lastCheckUpdateTime = 0;
+        private string _ignoreUpdateTag = string.Empty;
 
         private bool _showTagsAsTree = false;
         private bool _useTwoColumnsLayoutInHistories = false;

From 931831431b7be331f7e0ac1a4b942ffa1a209deb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 2 Sep 2024 14:14:52 +0800
Subject: [PATCH 04/21] enhance: reduce the times calling `Save()` (#436)

---
 src/ViewModels/CreateGroup.cs          |  2 +-
 src/ViewModels/DeleteRepositoryNode.cs |  2 +-
 src/ViewModels/Preference.cs           | 25 +++++++++++++++----------
 src/ViewModels/Welcome.cs              |  2 +-
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/ViewModels/CreateGroup.cs b/src/ViewModels/CreateGroup.cs
index 865ca4ac..cb94a0f6 100644
--- a/src/ViewModels/CreateGroup.cs
+++ b/src/ViewModels/CreateGroup.cs
@@ -27,7 +27,7 @@ namespace SourceGit.ViewModels
                 Name = _name,
                 IsRepository = false,
                 IsExpanded = false,
-            }, _parent);
+            }, _parent, true);
 
             Welcome.Instance.Refresh();
             return null;
diff --git a/src/ViewModels/DeleteRepositoryNode.cs b/src/ViewModels/DeleteRepositoryNode.cs
index 3354d41e..7cd0df5c 100644
--- a/src/ViewModels/DeleteRepositoryNode.cs
+++ b/src/ViewModels/DeleteRepositoryNode.cs
@@ -18,7 +18,7 @@ namespace SourceGit.ViewModels
 
         public override Task<bool> Sure()
         {
-            Preference.Instance.RemoveNode(_node);
+            Preference.Instance.RemoveNode(_node, true);
             Welcome.Instance.Refresh();
             return null;
         }
diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
index 3badb359..44ae9c1a 100644
--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preference.cs
@@ -343,7 +343,7 @@ namespace SourceGit.ViewModels
             return true;
         }
 
-        public void AddNode(RepositoryNode node, RepositoryNode to = null)
+        public void AddNode(RepositoryNode node, RepositoryNode to, bool save)
         {
             var collection = to == null ? RepositoryNodes : to.SubNodes;
             collection.Add(node);
@@ -355,7 +355,8 @@ namespace SourceGit.ViewModels
                 return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
             });
 
-            Save();
+            if (save)
+                Save();
         }
 
         public RepositoryNode FindNode(string id)
@@ -376,32 +377,36 @@ namespace SourceGit.ViewModels
                     IsRepository = true,
                 };
 
-                AddNode(node, parent);
+                AddNode(node, parent, true);
             }
             else if (shouldMoveNode)
             {
-                MoveNode(node, parent);
+                MoveNode(node, parent, true);
             }
 
             return node;
         }
 
-        public void MoveNode(RepositoryNode node, RepositoryNode to = null)
+        public void MoveNode(RepositoryNode node, RepositoryNode to, bool save)
         {
             if (to == null && RepositoryNodes.Contains(node))
                 return;
             if (to != null && to.SubNodes.Contains(node))
                 return;
 
-            RemoveNode(node);
-            AddNode(node, to);
-            Save();
+            RemoveNode(node, false);
+            AddNode(node, to, false);
+
+            if (save)
+                Save();
         }
 
-        public void RemoveNode(RepositoryNode node)
+        public void RemoveNode(RepositoryNode node, bool save)
         {
             RemoveNodeRecursive(node, RepositoryNodes);
-            Save();
+
+            if (save)
+                Save();
         }
 
         public void SortByRenamedNode(RepositoryNode node)
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index b193d5a4..420e9b03 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -139,7 +139,7 @@ namespace SourceGit.ViewModels
 
         public void MoveNode(RepositoryNode from, RepositoryNode to)
         {
-            Preference.Instance.MoveNode(from, to);
+            Preference.Instance.MoveNode(from, to, true);
             Refresh();
         }
 

From de8689001247920312bdc22484bf9d6a57926377 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 2 Sep 2024 14:34:51 +0800
Subject: [PATCH 05/21] ux: make it easier to change the width of column
 `AUTHOR`

---
 src/Views/Histories.axaml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 4696b9ef..6e694fa9 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -22,15 +22,17 @@
           <Grid>
             <Grid.ColumnDefinitions>
               <ColumnDefinition Width="*" MinWidth="100"/>
-              <ColumnDefinition Width="1"/>
+              <ColumnDefinition Width="3"/>
               <ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=TwoWay}" MinWidth="80"/>
               <ColumnDefinition Width="96" MaxWidth="96" MinWidth="96"/>
               <ColumnDefinition Width="156" MaxWidth="156" MinWidth="156"/>
             </Grid.ColumnDefinitions>
 
             <TextBlock Grid.Column="0" Classes="table_header" Text="{DynamicResource Text.Histories.Header.GraphAndSubject}" HorizontalAlignment="Center"/>
-            <GridSplitter Grid.Column="1" Width="1" MinWidth="0.5" Background="{DynamicResource Brush.Border0}" HorizontalAlignment="Center" VerticalAlignment="Stretch"/>
-            <TextBlock Grid.Column="2" Classes="table_header" Text="{DynamicResource Text.Histories.Header.Author}" HorizontalAlignment="Center"/>
+            <GridSplitter Grid.Column="1" Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
+            <Border Grid.Column="2" BorderThickness="1,0,0,0" BorderBrush="{DynamicResource Brush.Border0}" ClipToBounds="True">
+              <TextBlock Classes="table_header" Text="{DynamicResource Text.Histories.Header.Author}" HorizontalAlignment="Center"/>
+            </Border>
             <Border Grid.Column="3" BorderThickness="1,0" BorderBrush="{DynamicResource Brush.Border0}" ClipToBounds="True">
               <TextBlock Classes="table_header" Text="{DynamicResource Text.Histories.Header.SHA}" HorizontalAlignment="Center"/>
             </Border>

From fe7972684c4c379f614c2bca90ea5b6a93a6a53f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 2 Sep 2024 14:44:42 +0800
Subject: [PATCH 06/21] ux: change the icon for `Check refs that contains this
 commit` button

---
 src/Resources/Icons.axaml      | 2 +-
 src/Views/CommitBaseInfo.axaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index 8090e576..e7e09246 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -80,7 +80,7 @@
   <StreamGeometry x:Key="Icons.Pull">M432 0h160c27 0 48 21 48 48v336h175c36 0 53 43 28 68L539 757c-15 15-40 15-55 0L180 452c-25-25-7-68 28-68H384V48c0-27 21-48 48-48zm592 752v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h293l98 98c40 40 105 40 145 0l98-98H976c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Push">M592 768h-160c-27 0-48-21-48-48V384h-175c-36 0-53-43-28-68L485 11c15-15 40-15 55 0l304 304c25 25 7 68-28 68H640v336c0 27-21 48-48 48zm432-16v224c0 27-21 48-48 48H48c-27 0-48-21-48-48V752c0-27 21-48 48-48h272v16c0 62 50 112 112 112h160c62 0 112-50 112-112v-16h272c27 0 48 21 48 48zm-248 176c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40zm128 0c0-22-18-40-40-40s-40 18-40 40s18 40 40 40s40-18 40-40z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Rebase">M277 85a149 149 0 00-43 292v230a32 32 0 0064 0V555h267A160 160 0 00725 395v-12a149 149 0 10-64-5v17a96 96 0 01-96 96H299V383A149 149 0 00277 85zM228 720a32 32 0 00-37-52 150 150 0 00-53 68 32 32 0 1060 23 85 85 0 0130-39zm136-52a32 32 0 00-37 52 86 86 0 0130 39 32 32 0 1060-23 149 149 0 00-53-68zM204 833a32 32 0 10-55 32 149 149 0 0063 58 32 32 0 0028-57 85 85 0 01-36-33zm202 32a32 32 0 00-55-32 85 85 0 01-36 33 32 32 0 0028 57 149 149 0 0063-58z</StreamGeometry>
-  <StreamGeometry x:Key="Icons.Relation">M672 336l64-89c-13-19-26-45-26-70 0-64 51-115 109-115s109 51 109 115-51 115-109 115c-19 0-38-6-51-13l-64 89c32 38 51 89 51 147 0 70-32 128-77 172l51 64c13-6 32-13 51-13 57 0 109 51 109 115s-51 109-109 109-109-51-109-115c0-26 13-51 26-70L646 707c-32 19-64 26-102 26-121 0-217-102-217-223v-38l-57-13c-19 32-57 57-96 57C116 515 65 464 65 400s51-115 109-115 109 51 109 115v13l57 19C372 349 448 292 538 292c51 0 102 19 134 45z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Relation">m224 154a166 166 0 00-166 166v192a166 166 0 00166 166h64v-76h-64a90 90 0 01-90-90v-192a90 90 0 0190-90h320a90 90 0 0190 90v192a90 90 0 01-90 90h-128v77h128a166 166 0 00166-167v-192a166 166 0 00-166-166h-320zm166 390a90 90 0 0190-90h128v-76h-128a166 166 0 00-166 166v192a166 166 0 00166 166h320a166 166 0 00166-166v-192a166 166 0 00-166-166h-64v77h64a90 90 0 0190 90v192a90 90 0 01-90 90h-320a90 90 0 01-90-90v-192z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Remote">M706 302a289 289 0 00-173 44 27 27 0 1029 46 234 234 0 01125-36c23 0 45 3 66 9 93 28 161 114 161 215C914 704 813 805 687 805H337C211 805 110 704 110 580c0-96 61-178 147-210C282 263 379 183 495 183a245 245 0 01210 119z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Remote.Add">M364 512h67v108h108v67h-108v108h-67v-108h-108v-67h108v-108zm298-64A107 107 0 01768 555C768 614 720 660 660 660h-108v-54h-108v-108h-94v108h-94c4-21 22-47 44-51l-1-12a75 75 0 0171-75a128 128 0 01239-7a106 106 0 0153-14z</StreamGeometry>
   <StreamGeometry x:Key="Icons.RemoveAll">M1024 64v704h-128v128h-128v128h-768v-704h128v-128h128v-128zM64 960h640v-576h-640zM320 128v64h576v512h64v-576zM192 256v64h576v512h64v-576zM432 688L576 832H480L384 736 288 832H192l144-144L192 544h96L384 640l96-96H576z</StreamGeometry>
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index 6734ecdb..2ded8ac7 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -65,7 +65,7 @@
             </Button>
 
             <Button Classes="icon_button" Width="24" Cursor="Hand" Click="OnOpenContainsIn" IsVisible="{Binding #ThisControl.SupportsContainsIn}" ToolTip.Tip="{DynamicResource Text.CommitDetail.Info.ContainsIn}">
-              <Path Width="12" Height="12" Data="{StaticResource Icons.Relation}"/>
+              <Path Width="14" Height="14" Margin="0,1,0,0" Data="{StaticResource Icons.Relation}"/>
             </Button>
 
             <Button Classes="icon_button" Width="24" Cursor="Hand" Click="OnOpenWebLink" IsVisible="{Binding #ThisControl.WebLinks, Converter={x:Static c:ListConverters.IsNotNullOrEmpty}}" ToolTip.Tip="{DynamicResource Text.CommitDetail.Info.WebLinks}">

From 837e3889b7a6ee276c054cfd2b548a99039e8f00 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 2 Sep 2024 15:28:30 +0800
Subject: [PATCH 07/21] ux: column width in histories (#438)

---
 src/Views/Histories.axaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Views/Histories.axaml b/src/Views/Histories.axaml
index 6e694fa9..7cc0bea0 100644
--- a/src/Views/Histories.axaml
+++ b/src/Views/Histories.axaml
@@ -24,8 +24,8 @@
               <ColumnDefinition Width="*" MinWidth="100"/>
               <ColumnDefinition Width="3"/>
               <ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=TwoWay}" MinWidth="80"/>
-              <ColumnDefinition Width="96" MaxWidth="96" MinWidth="96"/>
-              <ColumnDefinition Width="156" MaxWidth="156" MinWidth="156"/>
+              <ColumnDefinition Width="100" MaxWidth="100" MinWidth="100"/>
+              <ColumnDefinition Width="170" MaxWidth="170" MinWidth="170"/>
             </Grid.ColumnDefinitions>
 
             <TextBlock Grid.Column="0" Classes="table_header" Text="{DynamicResource Text.Histories.Header.GraphAndSubject}" HorizontalAlignment="Center"/>
@@ -106,8 +106,8 @@
                   <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                     <ColumnDefinition Width="{Binding #ThisControl.AuthorNameColumnWidth, Mode=OneWay}"/>
-                    <ColumnDefinition Width="96" MaxWidth="96" MinWidth="96"/>
-                    <ColumnDefinition Width="156" MaxWidth="156" MinWidth="156"/>
+                    <ColumnDefinition Width="100" MaxWidth="100" MinWidth="100"/>
+                    <ColumnDefinition Width="170" MaxWidth="170" MinWidth="170"/>
                   </Grid.ColumnDefinitions>
 
                   <!-- Subject & REFS -->
@@ -161,7 +161,7 @@
                   </Grid>
 
                   <!-- SHA -->
-                  <Border Grid.Column="2" Padding="8,0" IsHitTestVisible="False" ClipToBounds="True">
+                  <Border Grid.Column="2" Padding="4,0" IsHitTestVisible="False" ClipToBounds="True">
                     <TextBlock Classes="primary"
                                Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
                                HorizontalAlignment="Center"
@@ -170,7 +170,7 @@
                   </Border>
 
                   <!-- COMMIT TIME -->
-                  <Border Grid.Column="3" Padding="8,0" ClipToBounds="True" IsHitTestVisible="False">
+                  <Border Grid.Column="3" Padding="4,0" ClipToBounds="True" IsHitTestVisible="False">
                     <v:CommitTimeTextBlock Classes="primary"
                                            HorizontalAlignment="Center"
                                            FontWeight="{Binding FontWeight}"

From dffd9d76760246e9eb162d9ad1fa938928f5988c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 2 Sep 2024 17:05:43 +0800
Subject: [PATCH 08/21] feature: add context menu item to move repository node
 (#437)

---
 src/Resources/Locales/en_US.axaml     |  3 +
 src/Resources/Locales/zh_CN.axaml     |  3 +
 src/Resources/Locales/zh_TW.axaml     |  3 +
 src/ViewModels/MoveRepositoryNode.cs  | 72 ++++++++++++++++++++++
 src/ViewModels/Welcome.cs             | 12 ++++
 src/Views/MoveRepositoryNode.axaml    | 89 +++++++++++++++++++++++++++
 src/Views/MoveRepositoryNode.axaml.cs | 14 +++++
 7 files changed, 196 insertions(+)
 create mode 100644 src/ViewModels/MoveRepositoryNode.cs
 create mode 100644 src/Views/MoveRepositoryNode.axaml
 create mode 100644 src/Views/MoveRepositoryNode.axaml.cs

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index ab29d6eb..a6938954 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -354,6 +354,8 @@
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">Into:</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>
   <x:String x:Key="Text.Merge.Source" xml:space="preserve">Source Branch:</x:String>
+  <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">Move Repository Node</x:String>
+  <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">Select parent node for:</x:String>
   <x:String x:Key="Text.Name" xml:space="preserve">Name:</x:String>
   <x:String x:Key="Text.NotConfigured" xml:space="preserve">Git has NOT been configured. Please to go [Preference] and configure it first.</x:String>
   <x:String x:Key="Text.Notice" xml:space="preserve">NOTICE</x:String>
@@ -588,6 +590,7 @@
   <x:String x:Key="Text.Welcome.Delete" xml:space="preserve">Delete</x:String>
   <x:String x:Key="Text.Welcome.DragDropTip" xml:space="preserve">DRAG &amp; DROP FOLDER SUPPORTED. CUSTOM GROUPING SUPPORTED.</x:String>
   <x:String x:Key="Text.Welcome.Edit" xml:space="preserve">Edit</x:String>
+  <x:String x:Key="Text.Welcome.Move" xml:space="preserve">Move to Another Group</x:String>
   <x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">Open All Repositories</x:String>
   <x:String x:Key="Text.Welcome.OpenOrInit" xml:space="preserve">Open Repository</x:String>
   <x:String x:Key="Text.Welcome.OpenTerminal" xml:space="preserve">Open Terminal</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 3986e358..d25ef88e 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -357,6 +357,8 @@
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">目标分支 ：</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">合并方式 ：</x:String>
   <x:String x:Key="Text.Merge.Source" xml:space="preserve">合并分支 ：</x:String>
+  <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">调整仓库分组</x:String>
+  <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">请选择目标分组：</x:String>
   <x:String x:Key="Text.Name" xml:space="preserve">名称 ：</x:String>
   <x:String x:Key="Text.NotConfigured" xml:space="preserve">GIT尚未配置。请打开【偏好设置】配置GIT路径。</x:String>
   <x:String x:Key="Text.Notice" xml:space="preserve">系统提示</x:String>
@@ -590,6 +592,7 @@
   <x:String x:Key="Text.Welcome.Delete" xml:space="preserve">删除</x:String>
   <x:String x:Key="Text.Welcome.DragDropTip" xml:space="preserve">支持拖放目录添加。支持自定义分组。</x:String>
   <x:String x:Key="Text.Welcome.Edit" xml:space="preserve">编辑</x:String>
+  <x:String x:Key="Text.Welcome.Move" xml:space="preserve">调整分组</x:String>
   <x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">打开所有包含仓库</x:String>
   <x:String x:Key="Text.Welcome.OpenOrInit" xml:space="preserve">打开本地仓库</x:String>
   <x:String x:Key="Text.Welcome.OpenTerminal" xml:space="preserve">打开终端</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 8d7a4bf1..b63b2365 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -357,6 +357,8 @@
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">目標分支:</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">合併方式:</x:String>
   <x:String x:Key="Text.Merge.Source" xml:space="preserve">合併分支:</x:String>
+  <x:String x:Key="Text.MoveRepositoryNode" xml:space="preserve">調整存放庫分組</x:String>
+  <x:String x:Key="Text.MoveRepositoryNode.Target" xml:space="preserve">請選擇目標分組：</x:String>
   <x:String x:Key="Text.Name" xml:space="preserve">名稱:</x:String>
   <x:String x:Key="Text.NotConfigured" xml:space="preserve">尚未設定 Git。請開啟 [偏好設定] 以設定 Git 路徑。</x:String>
   <x:String x:Key="Text.Notice" xml:space="preserve">系統提示</x:String>
@@ -591,6 +593,7 @@
   <x:String x:Key="Text.Welcome.Delete" xml:space="preserve">刪除</x:String>
   <x:String x:Key="Text.Welcome.DragDropTip" xml:space="preserve">支援拖放以新增目錄與自訂群組。</x:String>
   <x:String x:Key="Text.Welcome.Edit" xml:space="preserve">編輯</x:String>
+  <x:String x:Key="Text.Welcome.Move" xml:space="preserve">調整存放庫分組</x:String>
   <x:String x:Key="Text.Welcome.OpenAllInNode" xml:space="preserve">開啟所有包含存放庫</x:String>
   <x:String x:Key="Text.Welcome.OpenOrInit" xml:space="preserve">開啟本機存放庫</x:String>
   <x:String x:Key="Text.Welcome.OpenTerminal" xml:space="preserve">開啟終端機</x:String>
diff --git a/src/ViewModels/MoveRepositoryNode.cs b/src/ViewModels/MoveRepositoryNode.cs
new file mode 100644
index 00000000..e22de212
--- /dev/null
+++ b/src/ViewModels/MoveRepositoryNode.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace SourceGit.ViewModels
+{
+    public class MoveRepositoryNode : Popup
+    {
+        public RepositoryNode Target
+        {
+            get;
+            private set;
+        } = null;
+
+        public List<RepositoryNode> Rows
+        {
+            get;
+            private set;
+        } = [];
+
+        public RepositoryNode Selected
+        {
+            get => _selected;
+            set => SetProperty(ref _selected, value);
+        }
+
+        public MoveRepositoryNode(RepositoryNode target)
+        {
+            Target = target;
+            Rows.Add(new RepositoryNode() { 
+                Name = "ROOT", 
+                Depth = 0, 
+                Id = Guid.NewGuid().ToString() 
+            });
+            MakeRows(Preference.Instance.RepositoryNodes, 1);
+
+            View = new Views.MoveRepositoryNode() { DataContext = this };
+        }
+
+        public override Task<bool> Sure()
+        {
+            if (_selected != null)
+            {
+                var node = Preference.Instance.FindNode(_selected.Id);
+                Preference.Instance.MoveNode(Target, node, true);
+                Welcome.Instance.Refresh();
+            }
+
+            return null;
+        }
+
+        private void MakeRows(List<RepositoryNode> collection, int depth)
+        {
+            foreach (var node in collection)
+            {
+                if (node.IsRepository || node.Id == Target.Id)
+                    continue;
+
+                var dump = new RepositoryNode()
+                {
+                    Name = node.Name,
+                    Depth = depth,
+                    Id = node.Id
+                };
+                Rows.Add(dump);
+                MakeRows(node.SubNodes, depth + 1);
+            }
+        }
+
+        private RepositoryNode _selected = null;
+    }
+}
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index 420e9b03..a78faee3 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -172,6 +172,18 @@ namespace SourceGit.ViewModels
             };
             menu.Items.Add(edit);
 
+            var move = new MenuItem();
+            move.Header = App.Text("Welcome.Move");
+            move.Icon = App.CreateMenuIcon("Icons.Move");
+            move.Click += (_, e) =>
+            {
+                if (PopupHost.CanCreatePopup())
+                    PopupHost.ShowPopup(new MoveRepositoryNode(node));
+
+                e.Handled = true;
+            };
+            menu.Items.Add(move);
+
             if (node.IsRepository)
             {
                 var explore = new MenuItem();
diff --git a/src/Views/MoveRepositoryNode.axaml b/src/Views/MoveRepositoryNode.axaml
new file mode 100644
index 00000000..7c408487
--- /dev/null
+++ b/src/Views/MoveRepositoryNode.axaml
@@ -0,0 +1,89 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:v="using:SourceGit.Views"
+             xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:c="using:SourceGit.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SourceGit.Views.MoveRepositoryNode"
+             x:DataType="vm:MoveRepositoryNode">
+  <StackPanel Orientation="Vertical" Margin="8,0,0,0">
+    <TextBlock FontSize="18"
+               Classes="bold"
+               Text="{DynamicResource Text.MoveRepositoryNode}"/>
+
+    <StackPanel Height="28" Margin="4,16,4,0" Orientation="Horizontal">
+      <TextBlock VerticalAlignment="Center" Margin="0,0,8,0" Text="{DynamicResource Text.MoveRepositoryNode.Target}"/>
+      <TextBlock VerticalAlignment="Center" Text="{Binding Target.Name, Mode=OneTime}"/>
+    </StackPanel>
+
+    <ListBox x:Name="TreeContainer"
+             Margin="4,0"
+             Padding="4"
+             MinHeight="28"
+             MaxHeight="100"
+             Focusable="True"
+             BorderThickness="1"
+             BorderBrush="{DynamicResource Brush.Border2}"
+             CornerRadius="4"
+             Background="{DynamicResource Brush.Contents}"
+             ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+             ScrollViewer.VerticalScrollBarVisibility="Auto"
+             ItemsSource="{Binding Rows}"
+             SelectionMode="Single"
+             SelectedItem="{Binding Selected, Mode=TwoWay}">
+      <ListBox.Styles>
+        <Style Selector="ListBox">
+          <Setter Property="FocusAdorner">
+            <FocusAdornerTemplate>
+              <Border Background="Transparent" BorderThickness="0"/>
+            </FocusAdornerTemplate>
+          </Setter>
+        </Style>
+
+        <Style Selector="ListBoxItem" x:DataType="vm:RepositoryNode">
+          <Setter Property="Margin" Value="0"/>
+          <Setter Property="Padding" Value="0"/>
+          <Setter Property="Height" Value="30"/>
+          <Setter Property="CornerRadius" Value="4"/>
+          <Setter Property="FocusAdorner">
+            <FocusAdornerTemplate>
+              <Border Background="Transparent" BorderThickness="0"/>
+            </FocusAdornerTemplate>
+          </Setter>
+        </Style>
+      </ListBox.Styles>
+
+      <ListBox.ItemTemplate>
+        <DataTemplate DataType="vm:RepositoryNode">
+          <Grid Background="Transparent"
+                Height="30"
+                ColumnDefinitions="16,18,Auto,*"
+                Margin="{Binding Depth, Converter={x:Static c:IntConverters.ToTreeMargin}}"
+                ClipToBounds="True">
+            <ToggleButton Grid.Column="0"
+                          Classes="tree_expander"
+                          Focusable="False"
+                          HorizontalAlignment="Center"
+                          IsChecked="True"
+                          IsHitTestVisible="False"/>
+
+            <ToggleButton Grid.Column="1"
+                          Classes="folder"
+                          Focusable="False"
+                          Width="14" Height="14"
+                          HorizontalAlignment="Left"
+                          Foreground="{DynamicResource Brush.FG1}"
+                          IsChecked="True"/>
+
+            <TextBlock Grid.Column="2"
+                       Classes="primary"
+                       VerticalAlignment="Center"
+                       Text="{Binding Name}"/>
+          </Grid>
+        </DataTemplate>
+      </ListBox.ItemTemplate>
+    </ListBox>
+  </StackPanel>
+</UserControl>
diff --git a/src/Views/MoveRepositoryNode.axaml.cs b/src/Views/MoveRepositoryNode.axaml.cs
new file mode 100644
index 00000000..450c6924
--- /dev/null
+++ b/src/Views/MoveRepositoryNode.axaml.cs
@@ -0,0 +1,14 @@
+using Avalonia.Controls;
+
+namespace SourceGit.Views
+{
+    public partial class MoveRepositoryNode : UserControl
+    {
+        public MoveRepositoryNode()
+        {
+            InitializeComponent();
+        }
+    }
+}
+
+

From 72fbab3b2e5c000e38b007e99e6524cbdf4abcb7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 2 Sep 2024 17:33:00 +0800
Subject: [PATCH 09/21] ux: new icon for `Move to Anthor Group`

---
 src/Resources/Icons.axaml | 1 +
 src/ViewModels/Welcome.cs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index e7e09246..f13827fa 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -73,6 +73,7 @@
   <StreamGeometry x:Key="Icons.Merge">M824 645V307c0-56-46-102-102-102h-102V102l-154 154 154 154V307h102v338c-46 20-82 67-82 123 0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123zm-51 195c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72zM384 256c0-72-61-133-133-133-72 0-133 61-133 133 0 56 36 102 82 123v266C154 666 118 712 118 768c0 72 61 133 133 133 72 0 133-61 133-133 0-56-36-102-82-123V379C348 358 384 312 384 256zM323 768c0 41-31 72-72 72-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72zM251 328c-41 0-72-31-72-72s31-72 72-72c41 0 72 31 72 72s-31 72-72 72z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Modified">M896 64H128C96 64 64 96 64 128v768c0 32 32 64 64 64h768c32 0 64-32 64-64V128c0-32-32-64-64-64z m-64 736c0 16-17 32-32 32H224c-18 0-32-12-32-32V224c0-16 16-32 32-32h576c15 0 32 16 32 32v576zM512 384c-71 0-128 57-128 128s57 128 128 128 128-57 128-128-57-128-128-128z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Move">M299 811 299 725 384 725 384 811 299 811M469 811 469 725 555 725 555 811 469 811M640 811 640 725 725 725 725 811 640 811M299 640 299 555 384 555 384 640 299 640M469 640 469 555 555 555 555 640 469 640M640 640 640 555 725 555 725 640 640 640M299 469 299 384 384 384 384 469 299 469M469 469 469 384 555 384 555 469 469 469M640 469 640 384 725 384 725 469 640 469M299 299 299 213 384 213 384 299 299 299M469 299 469 213 555 213 555 299 469 299M640 299 640 213 725 213 725 299 640 299Z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.MoveToAnthorGroup">M64 363l0 204 265 0L329 460c0-11 6-18 14-20C349 437 355 437 362 441c93 60 226 149 226 149 33 22 34 60 0 82 0 0-133 89-226 149-14 9-32-3-32-18l-1-110L64 693l0 117c0 41 34 75 75 75l746 0c41 0 75-34 75-74L960 364c0-0 0-1 0-1L64 363zM64 214l0 75 650 0-33-80c-16-38-62-69-103-69l-440 0C97 139 64 173 64 214z</StreamGeometry>
   <StreamGeometry x:Key="Icons.OpenWith">M683 409v204L1024 308 683 0v191c-413 0-427 526-427 526c117-229 203-307 427-307zm85 492H102V327h153s38-63 114-122H51c-28 0-51 27-51 61v697c0 34 23 61 51 61h768c28 0 51-27 51-61V614l-102 100v187z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Password">M640 96c-158 0-288 130-288 288 0 17 3 31 5 46L105 681 96 691V928h224v-96h96v-96h96v-95c38 18 82 31 128 31 158 0 288-130 288-288s-130-288-288-288zm0 64c123 0 224 101 224 224s-101 224-224 224a235 235 0 01-109-28l-8-4H448v96h-96v96H256v96H160v-146l253-254 12-11-3-17C419 417 416 400 416 384c0-123 101-224 224-224zm64 96a64 64 0 100 128 64 64 0 100-128z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Paste">M544 85c49 0 90 37 95 85h75a96 96 0 0196 89L811 267a32 32 0 01-28 32L779 299a32 32 0 01-32-28L747 267a32 32 0 00-28-32L715 235h-91a96 96 0 01-80 42H395c-33 0-62-17-80-42L224 235a32 32 0 00-32 28L192 267v576c0 16 12 30 28 32l4 0h128a32 32 0 0132 28l0 4a32 32 0 01-32 32h-128a96 96 0 01-96-89L128 843V267a96 96 0 0189-96L224 171h75a96 96 0 0195-85h150zm256 256a96 96 0 0196 89l0 7v405a96 96 0 01-89 96L800 939h-277a96 96 0 01-96-89L427 843v-405a96 96 0 0189-96L523 341h277zm-256-192H395a32 32 0 000 64h150a32 32 0 100-64z</StreamGeometry>
diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index a78faee3..6d81a37e 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -174,7 +174,7 @@ namespace SourceGit.ViewModels
 
             var move = new MenuItem();
             move.Header = App.Text("Welcome.Move");
-            move.Icon = App.CreateMenuIcon("Icons.Move");
+            move.Icon = App.CreateMenuIcon("Icons.MoveToAnthorGroup");
             move.Click += (_, e) =>
             {
                 if (PopupHost.CanCreatePopup())

From b85c2a1754380733fc9a84a43ea0bba82e1d6c88 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 2 Sep 2024 17:44:02 +0800
Subject: [PATCH 10/21] ux: re-arrange context menu items of RepositoryNode in
 welcome page

---
 src/ViewModels/Welcome.cs | 61 ++++++++++++++++++++++++---------------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/ViewModels/Welcome.cs b/src/ViewModels/Welcome.cs
index 6d81a37e..f9761e02 100644
--- a/src/ViewModels/Welcome.cs
+++ b/src/ViewModels/Welcome.cs
@@ -162,30 +162,17 @@ namespace SourceGit.ViewModels
                 menu.Items.Add(new MenuItem() { Header = "-" });
             }
 
-            var edit = new MenuItem();
-            edit.Header = App.Text("Welcome.Edit");
-            edit.Icon = App.CreateMenuIcon("Icons.Edit");
-            edit.Click += (_, e) =>
-            {
-                node.Edit();
-                e.Handled = true;
-            };
-            menu.Items.Add(edit);
-
-            var move = new MenuItem();
-            move.Header = App.Text("Welcome.Move");
-            move.Icon = App.CreateMenuIcon("Icons.MoveToAnthorGroup");
-            move.Click += (_, e) =>
-            {
-                if (PopupHost.CanCreatePopup())
-                    PopupHost.ShowPopup(new MoveRepositoryNode(node));
-
-                e.Handled = true;
-            };
-            menu.Items.Add(move);
-
             if (node.IsRepository)
             {
+                var open = new MenuItem();
+                open.Header = App.Text("Welcome.OpenOrInit");
+                open.Icon = App.CreateMenuIcon("Icons.Folder.Open");
+                open.Click += (_, e) =>
+                {
+                    App.GetLauncer()?.OpenRepositoryInTab(node, null);
+                    e.Handled = true;
+                };
+
                 var explore = new MenuItem();
                 explore.Header = App.Text("Repository.Explore");
                 explore.Icon = App.CreateMenuIcon("Icons.Explore");
@@ -194,7 +181,6 @@ namespace SourceGit.ViewModels
                     node.OpenInFileManager();
                     e.Handled = true;
                 };
-                menu.Items.Add(explore);
 
                 var terminal = new MenuItem();
                 terminal.Header = App.Text("Repository.Terminal");
@@ -204,7 +190,12 @@ namespace SourceGit.ViewModels
                     node.OpenTerminal();
                     e.Handled = true;
                 };
+
+                menu.Items.Add(open);
+                menu.Items.Add(new MenuItem() { Header = "-" });
+                menu.Items.Add(explore);
                 menu.Items.Add(terminal);
+                menu.Items.Add(new MenuItem() { Header = "-" });
             }
             else
             {
@@ -219,6 +210,26 @@ namespace SourceGit.ViewModels
                 menu.Items.Add(addSubFolder);
             }
 
+            var edit = new MenuItem();
+            edit.Header = App.Text("Welcome.Edit");
+            edit.Icon = App.CreateMenuIcon("Icons.Edit");
+            edit.Click += (_, e) =>
+            {
+                node.Edit();
+                e.Handled = true;
+            };
+
+            var move = new MenuItem();
+            move.Header = App.Text("Welcome.Move");
+            move.Icon = App.CreateMenuIcon("Icons.MoveToAnthorGroup");
+            move.Click += (_, e) =>
+            {
+                if (PopupHost.CanCreatePopup())
+                    PopupHost.ShowPopup(new MoveRepositoryNode(node));
+
+                e.Handled = true;
+            };
+
             var delete = new MenuItem();
             delete.Header = App.Text("Welcome.Delete");
             delete.Icon = App.CreateMenuIcon("Icons.Clear");
@@ -227,6 +238,10 @@ namespace SourceGit.ViewModels
                 node.Delete();
                 e.Handled = true;
             };
+
+            menu.Items.Add(edit);
+            menu.Items.Add(move);
+            menu.Items.Add(new MenuItem() { Header = "-" });
             menu.Items.Add(delete);
 
             return menu;

From e27d2d6a3ff90153d3161affc9e1754defb78a2f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 2 Sep 2024 19:51:42 +0800
Subject: [PATCH 11/21] enhance: change default search commit method to
 `Message`

---
 src/ViewModels/Repository.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 4d822a40..62709b16 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1990,7 +1990,7 @@ namespace SourceGit.ViewModels
         private bool _isSearching = false;
         private bool _isSearchLoadingVisible = false;
         private bool _isSearchCommitSuggestionOpen = false;
-        private int _searchCommitFilterType = 0;
+        private int _searchCommitFilterType = 2;
         private bool _enableFirstParentInHistories = false;
         private string _searchCommitFilter = string.Empty;
         private List<Models.Commit> _searchedCommits = new List<Models.Commit>();

From 998230edfff695c1332edbb58a7c849ff1fce34c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 2 Sep 2024 20:27:12 +0800
Subject: [PATCH 12/21] code_style: simplify static commands used by styles and
 main menu; run `dotnet format`

---
 src/App.Commands.cs                    | 47 +++++---------------------
 src/App.axaml.cs                       | 11 ++++++
 src/Models/Statistics.cs               |  2 +-
 src/Resources/Styles.axaml             |  2 +-
 src/ViewModels/CommitDetail.cs         |  8 ++---
 src/ViewModels/MoveRepositoryNode.cs   |  9 ++---
 src/ViewModels/ScanRepositories.cs     |  2 +-
 src/Views/CaptionButtons.axaml.cs      |  2 +-
 src/Views/CaptionButtonsMacOS.axaml.cs |  2 +-
 src/Views/Welcome.axaml.cs             |  2 +-
 10 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/src/App.Commands.cs b/src/App.Commands.cs
index 4a594766..8a485029 100644
--- a/src/App.Commands.cs
+++ b/src/App.Commands.cs
@@ -6,7 +6,7 @@ namespace SourceGit
 {
     public partial class App
     {
-        public class SimpleCommand : ICommand
+        public class Command : ICommand
         {
             public event EventHandler CanExecuteChanged
             {
@@ -14,26 +14,7 @@ namespace SourceGit
                 remove { }
             }
 
-            public SimpleCommand(Action action)
-            {
-                _action = action;
-            }
-
-            public bool CanExecute(object parameter) => _action != null;
-            public void Execute(object parameter) => _action?.Invoke();
-
-            private Action _action = null;
-        }
-
-        public class ParameterCommand : ICommand
-        {
-            public event EventHandler CanExecuteChanged
-            {
-                add { }
-                remove { }
-            }
-
-            public ParameterCommand(Action<object> action)
+            public Command(Action<object> action)
             {
                 _action = action;
             }
@@ -44,22 +25,12 @@ namespace SourceGit
             private Action<object> _action = null;
         }
 
-        public static readonly SimpleCommand OpenPreferenceCommand = new SimpleCommand(() => OpenDialog(new Views.Preference()));
-        public static readonly SimpleCommand OpenHotkeysCommand = new SimpleCommand(() => OpenDialog(new Views.Hotkeys()));
-        public static readonly SimpleCommand OpenAppDataDirCommand = new SimpleCommand(() => Native.OS.OpenInFileManager(Native.OS.DataDir));
-        public static readonly SimpleCommand OpenAboutCommand = new SimpleCommand(() => OpenDialog(new Views.About()));
-        public static readonly SimpleCommand CheckForUpdateCommand = new SimpleCommand(() => Check4Update(true));
-        public static readonly SimpleCommand QuitCommand = new SimpleCommand(() => Quit(0));
-
-        public static readonly ParameterCommand CopyTextCommand = new ParameterCommand(param =>
-        {
-            if (param is TextBlock textBlock)
-            {
-                if (textBlock.Inlines is { Count: > 0 } inlines)
-                    CopyText(inlines.Text);
-                else
-                    CopyText(textBlock.Text);
-            }
-        });
+        public static readonly Command OpenPreferenceCommand = new Command(_ => OpenDialog(new Views.Preference()));
+        public static readonly Command OpenHotkeysCommand = new Command(_ => OpenDialog(new Views.Hotkeys()));
+        public static readonly Command OpenAppDataDirCommand = new Command(_ => Native.OS.OpenInFileManager(Native.OS.DataDir));
+        public static readonly Command OpenAboutCommand = new Command(_ => OpenDialog(new Views.About()));
+        public static readonly Command CheckForUpdateCommand = new Command(_ => Check4Update(true));
+        public static readonly Command QuitCommand = new Command(_ => Quit(0));
+        public static readonly Command CopyTextBlockCommand = new Command(p => CopyTextBlock(p as TextBlock));
     }
 }
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index f4ec6a11..b64e65c0 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -318,6 +318,17 @@ namespace SourceGit
             }
         }
 
+        private static void CopyTextBlock(TextBlock textBlock)
+        {
+            if (textBlock == null)
+                return;
+
+            if (textBlock.Inlines is { Count: > 0 } inlines)
+                CopyText(inlines.Text);
+            else if (!string.IsNullOrEmpty(textBlock.Text))
+                CopyText(textBlock.Text);
+        }
+
         private static void LogException(Exception ex)
         {
             if (ex == null)
diff --git a/src/Models/Statistics.cs b/src/Models/Statistics.cs
index 60517e59..21f1e65d 100644
--- a/src/Models/Statistics.cs
+++ b/src/Models/Statistics.cs
@@ -62,7 +62,7 @@ namespace SourceGit.Models
             for (int i = 0; i < monthDays; i++)
                 Month.Samples.Add(new StatisticsSample($"{i + 1}"));
 
-            string[] weekDayNames = [ "SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT" ];
+            string[] weekDayNames = ["SUN", "MON", "TUE", "WED", "THU", "FRI", "SAT"];
             for (int i = 0; i < weekDayNames.Length; i++)
                 Week.Samples.Add(new StatisticsSample(weekDayNames[i]));
         }
diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 91563527..31c4cd59 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -339,7 +339,7 @@
           </MenuItem>
           
           <MenuItem Header="{DynamicResource Text.CopyAllText}"
-                    Command="{x:Static s:App.CopyTextCommand}"
+                    Command="{x:Static s:App.CopyTextBlockCommand}"
                     CommandParameter="{Binding $parent[SelectableTextBlock]}">
             <MenuItem.Icon>
               <Path Width="11" Height="11" Data="{StaticResource Icons.Copy}" VerticalAlignment="Center"/>
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 758d853a..95a2f5e1 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -262,7 +262,7 @@ namespace SourceGit.ViewModels
                 Task.Run(() => Commands.MergeTool.OpenForDiff(_repo.FullPath, toolType, toolPath, opt));
                 ev.Handled = true;
             };
-            
+
             var fullPath = Path.Combine(_repo.FullPath, change.Path);
             var explore = new MenuItem();
             explore.Header = App.Text("RevealFile");
@@ -320,11 +320,11 @@ namespace SourceGit.ViewModels
             {
                 if (change.Index == Models.ChangeState.Renamed)
                     new Commands.Checkout(_repo.FullPath).FileWithRevision(change.OriginalPath, $"{_commit.SHA}~1");
-                
+
                 new Commands.Checkout(_repo.FullPath).FileWithRevision(change.Path, $"{_commit.SHA}~1");
                 ev.Handled = true;
             };
-            
+
             menu.Items.Add(resetToThisRevision);
             menu.Items.Add(resetToFirstParent);
             menu.Items.Add(new MenuItem { Header = "-" });
@@ -413,7 +413,7 @@ namespace SourceGit.ViewModels
                 window.Show();
                 ev.Handled = true;
             };
-            
+
             var resetToThisRevision = new MenuItem();
             resetToThisRevision.Header = App.Text("ChangeCM.CheckoutThisRevision");
             resetToThisRevision.Icon = App.CreateMenuIcon("Icons.File.Checkout");
diff --git a/src/ViewModels/MoveRepositoryNode.cs b/src/ViewModels/MoveRepositoryNode.cs
index e22de212..766d2e78 100644
--- a/src/ViewModels/MoveRepositoryNode.cs
+++ b/src/ViewModels/MoveRepositoryNode.cs
@@ -27,10 +27,11 @@ namespace SourceGit.ViewModels
         public MoveRepositoryNode(RepositoryNode target)
         {
             Target = target;
-            Rows.Add(new RepositoryNode() { 
-                Name = "ROOT", 
-                Depth = 0, 
-                Id = Guid.NewGuid().ToString() 
+            Rows.Add(new RepositoryNode()
+            {
+                Name = "ROOT",
+                Depth = 0,
+                Id = Guid.NewGuid().ToString()
             });
             MakeRows(Preference.Instance.RepositoryNodes, 1);
 
diff --git a/src/ViewModels/ScanRepositories.cs b/src/ViewModels/ScanRepositories.cs
index 73bb6916..6130801d 100644
--- a/src/ViewModels/ScanRepositories.cs
+++ b/src/ViewModels/ScanRepositories.cs
@@ -42,7 +42,7 @@ namespace SourceGit.ViewModels
                 Dispatcher.UIThread.Invoke(() =>
                 {
                     var normalizedRoot = rootDir.FullName.Replace("\\", "/");
-                    
+
                     foreach (var f in founded)
                     {
                         var parent = new DirectoryInfo(f).Parent!.FullName.Replace("\\", "/");
diff --git a/src/Views/CaptionButtons.axaml.cs b/src/Views/CaptionButtons.axaml.cs
index f585083d..650ccef0 100644
--- a/src/Views/CaptionButtons.axaml.cs
+++ b/src/Views/CaptionButtons.axaml.cs
@@ -15,7 +15,7 @@ namespace SourceGit.Views
             get => GetValue(IsCloseButtonOnlyProperty);
             set => SetValue(IsCloseButtonOnlyProperty, value);
         }
-        
+
         public CaptionButtons()
         {
             InitializeComponent();
diff --git a/src/Views/CaptionButtonsMacOS.axaml.cs b/src/Views/CaptionButtonsMacOS.axaml.cs
index ec1f2b2c..98bbb88f 100644
--- a/src/Views/CaptionButtonsMacOS.axaml.cs
+++ b/src/Views/CaptionButtonsMacOS.axaml.cs
@@ -15,7 +15,7 @@ namespace SourceGit.Views
             get => GetValue(IsCloseButtonOnlyProperty);
             set => SetValue(IsCloseButtonOnlyProperty, value);
         }
-        
+
         public CaptionButtonsMacOS()
         {
             InitializeComponent();
diff --git a/src/Views/Welcome.axaml.cs b/src/Views/Welcome.axaml.cs
index 93e673cd..4add5d1d 100644
--- a/src/Views/Welcome.axaml.cs
+++ b/src/Views/Welcome.axaml.cs
@@ -224,7 +224,7 @@ namespace SourceGit.Views
                 return;
             }
 
-            if (e.Data.Contains("MovedRepositoryTreeNode") && 
+            if (e.Data.Contains("MovedRepositoryTreeNode") &&
                 e.Data.Get("MovedRepositoryTreeNode") is ViewModels.RepositoryNode moved)
             {
                 e.Handled = true;

From 0e774ee03573c6d120e26108dc4fc42555a75081 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 4 Sep 2024 15:54:12 +0800
Subject: [PATCH 13/21] ux: window caption button (#442)

---
 src/Resources/Icons.axaml      | 2 +-
 src/Resources/Styles.axaml     | 1 +
 src/Views/CaptionButtons.axaml | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index f13827fa..7ae35731 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -115,7 +115,7 @@
   <StreamGeometry x:Key="Icons.Waiting">M812 864h-29V654c0-21-11-40-28-52l-133-88 134-89c18-12 28-31 28-52V164h28c18 0 32-14 32-32s-14-32-32-32H212c-18 0-32 14-32 32s14 32 32 32h30v210c0 21 11 40 28 52l133 88-134 89c-18 12-28 31-28 52V864H212c-18 0-32 14-32 32s14 32 32 32h600c18 0 32-14 32-32s-14-32-32-32zM441 566c18-12 28-31 28-52s-11-40-28-52L306 373V164h414v209l-136 90c-18 12-28 31-28 52 0 21 11 40 28 52l135 89V695c-9-7-20-13-32-19-30-15-93-41-176-41-63 0-125 14-175 38-12 6-22 12-31 18v-36l136-90z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Whitespace">M416 64H768v64h-64v704h64v64H448v-64h64V512H416a224 224 0 1 1 0-448zM576 832h64V128H576v704zM416 128H512v320H416a160 160 0 0 1 0-320z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Window.Close">M519 459 222 162a37 37 0 10-52 52l297 297L169 809a37 37 0 1052 52l297-297 297 297a37 37 0 1052-52l-297-297 297-297a37 37 0 10-52-52L519 459z</StreamGeometry>
-  <StreamGeometry x:Key="Icons.Window.Minimize">M0 0M1024 1024 M960 544H64a32 32 0 1 1 0-64h896a32 32 0 1 1 0 64</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Window.Minimize">M1024 565V459H0V565H1024ZM512 0M512 1024</StreamGeometry>
   <StreamGeometry x:Key="Icons.Window.Maximize">M153 154h768v768h-768v-768zm64 64v640h640v-640h-640z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Window.Restore">M256 128l0 192L64 320l0 576 704 0 0-192 192 0L960 128 256 128zM704 832 128 832 128 384l576 0L704 832zM896 640l-128 0L768 320 320 320 320 192l576 0L896 640z</StreamGeometry>
   <StreamGeometry x:Key="Icons.WordWrap">M248 221a77 77 0 00-30-21c-18-7-40-10-68-5a224 224 0 00-45 13c-5 2-10 5-15 8l-3 2v68l11-9c10-8 21-14 34-19 13-5 26-7 39-7 12 0 21 3 28 10 6 6 9 16 9 29l-62 9c-14 2-26 6-36 11a80 80 0 00-25 20c-7 8-12 17-15 27-6 21-6 44 1 65a70 70 0 0041 43c10 4 21 6 34 6a80 80 0 0063-28v22h64V298c0-16-2-31-6-44a91 91 0 00-18-33zm-41 121v15c0 8-1 15-4 22a48 48 0 01-24 29 44 44 0 01-33 2 29 29 0 01-10-6 25 25 0 01-6-9 30 30 0 01-2-12c0-5 1-9 2-14a21 21 0 015-9 28 28 0 0110-7 83 83 0 0120-5l42-6zm323-68a144 144 0 00-16-42 87 87 0 00-28-29 75 75 0 00-41-11 73 73 0 00-44 14c-6 5-12 11-17 17V64H326v398h59v-18c8 10 18 17 30 21 6 2 13 3 21 3 16 0 31-4 43-11 12-7 23-18 31-31a147 147 0 0019-46 248 248 0 006-57c0-17-2-33-5-49zm-55 49c0 15-1 28-4 39-2 11-6 20-10 27a41 41 0 01-15 15 37 37 0 01-36 1 44 44 0 01-13-12 59 59 0 01-9-18A76 76 0 01384 352v-33c0-10 1-20 4-29 2-8 6-15 10-22a43 43 0 0115-13 37 37 0 0119-5 35 35 0 0132 18c4 6 7 14 9 23 2 9 3 20 3 31zM154 634a58 58 0 0120-15c14-6 35-7 49-1 7 3 13 6 20 12l21 17V572l-6-4a124 124 0 00-58-14c-20 0-38 4-54 11-16 7-30 17-41 30-12 13-20 29-26 46-6 17-9 36-9 57 0 18 3 36 8 52 6 16 14 30 24 42 10 12 23 21 38 28 15 7 32 10 50 10 15 0 28-2 39-5 11-3 21-8 30-14l5-4v-57l-13 6a26 26 0 01-5 2c-3 1-6 2-8 3-2 1-15 6-15 6-4 2-9 3-14 4a63 63 0 01-38-4 53 53 0 01-20-14 70 70 0 01-13-24 111 111 0 01-5-34c0-13 2-26 5-36 3-10 8-19 14-26zM896 384h-256V320h288c21 1 32 12 32 32v384c0 18-12 32-32 32H504l132 133-45 45-185-185c-16-21-16-25 0-45l185-185L637 576l-128 128H896V384z</StreamGeometry>
diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 31c4cd59..b5d4dddb 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -437,6 +437,7 @@
   <Style Selector="Button.caption_button > Path">
     <Setter Property="Width" Value="10"/>
     <Setter Property="Height" Value="10"/>
+    <Setter Property="Fill" Value="{DynamicResource Brush.FG1}"/>
   </Style>
   <Style Selector="Button.caption_button /template/ ContentPresenter#PART_ContentPresenter">
     <Setter Property="Background" Value="Transparent"/>
diff --git a/src/Views/CaptionButtons.axaml b/src/Views/CaptionButtons.axaml
index abbc8aaa..4ac07880 100644
--- a/src/Views/CaptionButtons.axaml
+++ b/src/Views/CaptionButtons.axaml
@@ -13,7 +13,7 @@
       <Path/>
     </Button>
     <Button Classes="caption_button" Click="CloseWindow">
-      <Path Data="{StaticResource Icons.Window.Close}" Width="9" Height="9"/>
+      <Path Data="{StaticResource Icons.Window.Close}"/>
     </Button>
   </StackPanel>
 </UserControl>

From b1457fe39d7dd777d23843784abe9b8d0fd9d965 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 6 Sep 2024 09:57:22 +0800
Subject: [PATCH 14/21] feature: supports filter submodules (#443)

---
 src/Resources/Locales/de_DE.axaml |  2 +-
 src/Resources/Locales/en_US.axaml |  2 +-
 src/Resources/Locales/fr_FR.axaml |  2 +-
 src/Resources/Locales/pt_BR.axaml |  2 +-
 src/Resources/Locales/zh_CN.axaml |  2 +-
 src/Resources/Locales/zh_TW.axaml |  2 +-
 src/ViewModels/Repository.cs      | 63 +++++++++++++++++++++++--------
 src/Views/Repository.axaml        | 12 +++---
 src/Views/Repository.axaml.cs     |  2 +-
 9 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 7f6a6a18..adc22a10 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -482,6 +482,7 @@
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Repository Einstellungen</x:String>
   <x:String x:Key="Text.Repository.Continue" xml:space="preserve">WEITER</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Öffne im Datei-Browser</x:String>
+  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Suche Branches &amp; Tags &amp; Submodules</x:String>
   <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">GEFILTERT:</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOKALE BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Zum HEAD wechseln</x:String>
@@ -499,7 +500,6 @@
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Commit-Nachricht</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Autor &amp; Committer</x:String>
-  <x:String x:Key="Text.Repository.SearchBranchTag" xml:space="preserve">Suche Branches &amp; Tags</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Zeige Tags als Baum</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Statistiken</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">SUBMODULE</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index a6938954..68957769 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -484,6 +484,7 @@
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configure this repository</x:String>
   <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUE</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 &amp; Tags &amp; Submodules</x:String>
   <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">FILTERED BY:</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOCAL BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navigate To HEAD</x:String>
@@ -501,7 +502,6 @@
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Message</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Author &amp; Committer</x:String>
-  <x:String x:Key="Text.Repository.SearchBranchTag" xml:space="preserve">Search Branches &amp; Tags</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Show Tags as Tree</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Statistics</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">SUBMODULES</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 6209a100..57bf0569 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -481,6 +481,7 @@
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configure this repository</x:String>
   <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUE</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Ouvrir dans l'explorateur Windows</x:String>
+  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Search Branches &amp; Tags &amp; Submodules</x:String>
   <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">FILTERED BY:</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">LOCAL BRANCHES</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navigate To HEAD</x:String>
@@ -498,7 +499,6 @@
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Message</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Author &amp; Committer</x:String>
-  <x:String x:Key="Text.Repository.SearchBranchTag" xml:space="preserve">Search Branches &amp; Tags</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Show Tags as Tree</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Statistics</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">SUBMODULES</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 1b3dc48f..d7e3456f 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -474,6 +474,7 @@
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">Configurar este repositório</x:String>
   <x:String x:Key="Text.Repository.Continue" xml:space="preserve">CONTINUAR</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Abrir no Navegador de Arquivos</x:String>
+  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Pesquisar Branches &amp; Tags &amp; Submódulos</x:String>
   <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">FILTRADO POR:</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">BRANCHES LOCAIS</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">Navegar para HEAD</x:String>
@@ -491,7 +492,6 @@
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Mensagem</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">Autor &amp; Committer</x:String>
-  <x:String x:Key="Text.Repository.SearchBranchTag" xml:space="preserve">Pesquisar Branches &amp; Tags</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">Mostrar Tags como Árvore</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">Estatísticas</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">SUBMÓDULOS</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index d25ef88e..550750a6 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -486,6 +486,7 @@
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">配置本仓库</x:String>
   <x:String x:Key="Text.Repository.Continue" xml:space="preserve">下一步</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">在文件浏览器中打开</x:String>
+  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">快速查找分支、标签、子模块</x:String>
   <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">过滤规则 ：</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">本地分支</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">定位HEAD</x:String>
@@ -503,7 +504,6 @@
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">提交信息</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">提交指纹</x:String>
   <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">作者及提交者</x:String>
-  <x:String x:Key="Text.Repository.SearchBranchTag" xml:space="preserve">快速查找分支、标签</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">以树型结构展示</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">提交统计</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">子模块列表</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index b63b2365..279f63b0 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -487,6 +487,7 @@
   <x:String x:Key="Text.Repository.Configure" xml:space="preserve">設定本存放庫</x:String>
   <x:String x:Key="Text.Repository.Continue" xml:space="preserve">下一步</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">在檔案瀏覽器中開啟</x:String>
+  <x:String x:Key="Text.Repository.Filter" xml:space="preserve">快速搜尋分支、標籤、子模組</x:String>
   <x:String x:Key="Text.Repository.FilterCommitPrefix" xml:space="preserve">篩選規則:</x:String>
   <x:String x:Key="Text.Repository.LocalBranches" xml:space="preserve">本機分支</x:String>
   <x:String x:Key="Text.Repository.NavigateToCurrentHead" xml:space="preserve">回到 HEAD</x:String>
@@ -504,7 +505,6 @@
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">提交訊息</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">提交編號</x:String>
   <x:String x:Key="Text.Repository.Search.ByUser" xml:space="preserve">作者及提交者</x:String>
-  <x:String x:Key="Text.Repository.SearchBranchTag" xml:space="preserve">快速搜尋分支、標籤</x:String>
   <x:String x:Key="Text.Repository.ShowTagsAsTree" xml:space="preserve">以樹型結構展示</x:String>
   <x:String x:Key="Text.Repository.Statistics" xml:space="preserve">提交統計</x:String>
   <x:String x:Key="Text.Repository.Submodules" xml:space="preserve">子模組列表</x:String>
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 62709b16..4f550ddd 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -83,17 +83,18 @@ namespace SourceGit.ViewModels
             }
         }
 
-        public string SearchBranchFilter
+        public string Filter
         {
-            get => _searchBranchFilter;
+            get => _filter;
             set
             {
-                if (SetProperty(ref _searchBranchFilter, value))
+                if (SetProperty(ref _filter, value))
                 {
                     var builder = BuildBranchTree(_branches, _remotes);
                     LocalBranchTrees = builder.Locals;
                     RemoteBranchTrees = builder.Remotes;
                     VisibleTags = BuildVisibleTags();
+                    VisibleSubmodules = BuildVisibleSubmodules();
                 }
             }
         }
@@ -152,6 +153,12 @@ namespace SourceGit.ViewModels
             private set => SetProperty(ref _submodules, value);
         }
 
+        public List<Models.Submodule> VisibleSubmodules
+        {
+            get => _visibleSubmodules;
+            private set => SetProperty(ref _visibleSubmodules, value);
+        }
+
         public int LocalChangesCount
         {
             get => _localChangesCount;
@@ -391,6 +398,7 @@ namespace SourceGit.ViewModels
             _tags.Clear();
             _visibleTags.Clear();
             _submodules.Clear();
+            _visibleSubmodules.Clear();
             _searchedCommits.Clear();
 
             _revisionFiles.Clear();
@@ -525,6 +533,11 @@ namespace SourceGit.ViewModels
             PopupHost.ShowAndStartPopup(new Cleanup(this));
         }
 
+        public void ClearFilter()
+        {
+            Filter = string.Empty;
+        }
+
         public void ClearHistoriesFilter()
         {
             _settings.Filters.Clear();
@@ -582,11 +595,6 @@ namespace SourceGit.ViewModels
             });
         }
 
-        public void ClearSearchBranchFilter()
-        {
-            SearchBranchFilter = string.Empty;
-        }
-
         public void SetWatcherEnabled(bool enabled)
         {
             _watcher?.SetEnabled(enabled);
@@ -811,7 +819,12 @@ namespace SourceGit.ViewModels
         {
             var submodules = new Commands.QuerySubmodules(_fullpath).Result();
             _watcher?.SetSubmodules(submodules);
-            Dispatcher.UIThread.Invoke(() => Submodules = submodules);
+
+            Dispatcher.UIThread.Invoke(() =>
+            {
+                Submodules = submodules;
+                VisibleSubmodules = BuildVisibleSubmodules();
+            });
         }
 
         public void RefreshWorkingCopyChanges()
@@ -1919,7 +1932,7 @@ namespace SourceGit.ViewModels
             var builder = new BranchTreeNode.Builder();
             builder.SetFilters(_settings.Filters);
 
-            if (string.IsNullOrEmpty(_searchBranchFilter))
+            if (string.IsNullOrEmpty(_filter))
             {
                 builder.CollectExpandedNodes(_localBranchTrees, true);
                 builder.CollectExpandedNodes(_remoteBranchTrees, false);
@@ -1930,7 +1943,7 @@ namespace SourceGit.ViewModels
                 var visibles = new List<Models.Branch>();
                 foreach (var b in branches)
                 {
-                    if (b.FullName.Contains(_searchBranchFilter, StringComparison.OrdinalIgnoreCase))
+                    if (b.FullName.Contains(_filter, StringComparison.OrdinalIgnoreCase))
                         visibles.Add(b);
                 }
 
@@ -1943,7 +1956,7 @@ namespace SourceGit.ViewModels
         private List<Models.Tag> BuildVisibleTags()
         {
             var visible = new List<Models.Tag>();
-            if (string.IsNullOrEmpty(_searchBranchFilter))
+            if (string.IsNullOrEmpty(_filter))
             {
                 visible.AddRange(_tags);
             }
@@ -1951,7 +1964,7 @@ namespace SourceGit.ViewModels
             {
                 foreach (var t in _tags)
                 {
-                    if (t.Name.Contains(_searchBranchFilter, StringComparison.OrdinalIgnoreCase))
+                    if (t.Name.Contains(_filter, StringComparison.OrdinalIgnoreCase))
                         visible.Add(t);
                 }
             }
@@ -1959,6 +1972,24 @@ namespace SourceGit.ViewModels
             return visible;
         }
 
+        private List<Models.Submodule> BuildVisibleSubmodules()
+        {
+            var visible = new List<Models.Submodule>();
+            if (string.IsNullOrEmpty(_filter))
+            {
+                visible.AddRange(_submodules);
+            }
+            else
+            {
+                foreach (var s in _submodules)
+                {
+                    if (s.Path.Contains(_filter, StringComparison.OrdinalIgnoreCase))
+                        visible.Add(s);
+                }
+            }
+            return visible;
+        }
+
         private void UpdateCurrentRevisionFilesForSearchSuggestion()
         {
             _revisionFiles.Clear();
@@ -2002,8 +2033,7 @@ namespace SourceGit.ViewModels
         private bool _isSubmoduleGroupExpanded = false;
         private bool _isWorktreeGroupExpanded = false;
 
-        private string _searchBranchFilter = string.Empty;
-
+        private string _filter = string.Empty;
         private List<Models.Remote> _remotes = new List<Models.Remote>();
         private List<Models.Branch> _branches = new List<Models.Branch>();
         private Models.Branch _currentBranch = null;
@@ -2013,8 +2043,9 @@ namespace SourceGit.ViewModels
         private List<Models.Tag> _tags = new List<Models.Tag>();
         private List<Models.Tag> _visibleTags = new List<Models.Tag>();
         private List<Models.Submodule> _submodules = new List<Models.Submodule>();
-        private bool _includeUntracked = true;
+        private List<Models.Submodule> _visibleSubmodules = new List<Models.Submodule>();
 
+        private bool _includeUntracked = true;
         private InProgressContext _inProgressContext = null;
         private bool _hasUnsolvedConflicts = false;
         private Models.Commit _searchResultSelectedCommit = null;
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 7a8bd2a1..ba4ac133 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -128,15 +128,15 @@
           </Border>
         </Border>
         
-        <!-- Filter Branches -->
+        <!-- Filter Branches/Tags/Submodules -->
         <TextBox Grid.Row="1"
                  Height="24"
                  Margin="8,6,4,0"
                  BorderThickness="1"
                  CornerRadius="4"
                  BorderBrush="{DynamicResource Brush.Border2}"
-                 Watermark="{DynamicResource Text.Repository.SearchBranchTag}"
-                 Text="{Binding SearchBranchFilter, Mode=TwoWay}"
+                 Watermark="{DynamicResource Text.Repository.Filter}"
+                 Text="{Binding Filter, Mode=TwoWay}"
                  VerticalContentAlignment="Center">
           <TextBox.InnerLeftContent>
             <Path Width="14" Height="14"
@@ -149,8 +149,8 @@
             <Button Classes="icon_button"
                     Width="16"
                     Margin="0,0,6,0"
-                    Command="{Binding ClearSearchBranchFilter}"
-                    IsVisible="{Binding SearchBranchFilter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                    Command="{Binding ClearFilter}"
+                    IsVisible="{Binding Filter, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                     HorizontalAlignment="Right">
               <Path Width="14" Height="14"
                     Margin="0,1,0,0"
@@ -253,7 +253,7 @@
                    Height="0"
                    Margin="8,0,4,0"
                    Classes="repo_left_content_list"
-                   ItemsSource="{Binding Submodules}"
+                   ItemsSource="{Binding VisibleSubmodules}"
                    SelectionMode="Single"
                    ContextRequested="OnSubmoduleContextRequested"
                    DoubleTapped="OnDoubleTappedSubmodule"
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index ff13b8c8..499f5e62 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -252,7 +252,7 @@ namespace SourceGit.Views
             var remoteBranchRows = vm.IsRemoteGroupExpanded ? RemoteBranchTree.Rows.Count : 0;
             var desiredBranches = (localBranchRows + remoteBranchRows) * 24.0;
             var desiredTag = vm.IsTagGroupExpanded ? 24.0 * TagsList.Rows : 0;
-            var desiredSubmodule = vm.IsSubmoduleGroupExpanded ? 24.0 * vm.Submodules.Count : 0;
+            var desiredSubmodule = vm.IsSubmoduleGroupExpanded ? 24.0 * vm.VisibleSubmodules.Count : 0;
             var desiredWorktree = vm.IsWorktreeGroupExpanded ? 24.0 * vm.Worktrees.Count : 0;
             var desiredOthers = desiredTag + desiredSubmodule + desiredWorktree;
             var hasOverflow = (desiredBranches + desiredOthers > leftHeight);

From ea164bfdf40ed85cb3e6596acf449103df8f11e4 Mon Sep 17 00:00:00 2001
From: UchiTesting <uchitesting57@gmail.com>
Date: Sat, 24 Aug 2024 14:24:35 +0200
Subject: [PATCH 15/21] style(locale): Fix mistake in French translation

Text.DeleteMultiBranch.Tip had the term branch in singular instead of plural
---
 src/Resources/Locales/fr_FR.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 57bf0569..0f09ccd0 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -181,7 +181,7 @@
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Vous êtes sur le point de supprimer une branche distante !!!</x:String>
   <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Supprimer également la branche distante ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Supprimer plusieurs branches</x:String>
-  <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Vous essayez de supprimer plusieurs branche à la fois. Assurez-vous de revérifier avant de procéder !</x:String>
+  <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Vous essayez de supprimer plusieurs branches à la fois. Assurez-vous de revérifier avant de procéder !</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">Supprimer Remote</x:String>
   <x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">Remote :</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">Cible :</x:String>

From 74bffc39b49c7b2a7d0555da9a96a835543f02b1 Mon Sep 17 00:00:00 2001
From: UchiTesting <uchitesting57@gmail.com>
Date: Sat, 31 Aug 2024 16:57:09 +0200
Subject: [PATCH 16/21] style(locale): Translate Text.Histories section to
 French

---
 src/Resources/Locales/fr_FR.axaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 0f09ccd0..9ab1c322 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -209,7 +209,7 @@
   <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Ouvrir dans l'outil de merge</x:String>
   <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">Réduit le nombre de ligne visibles</x:String>
   <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">Augmente le nombre de ligne visibles</x:String>
-  <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">SELECTIONNER UN FICHIER POUR VOIR LES CHANGEMENTS</x:String>
+  <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">SÉLECTIONNER UN FICHIER POUR VOIR LES CHANGEMENTS</x:String>
   <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Afficher les caractères invisibles</x:String>
   <x:String x:Key="Text.Diff.SwapCommits" xml:space="preserve">Permuter</x:String>
   <x:String x:Key="Text.DiffWithMerger" xml:space="preserve">Ouvrir dans l'outil de merge</x:String>
@@ -298,16 +298,16 @@
   <x:String x:Key="Text.GitLFS.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.GitLFS.Track" xml:space="preserve">Track files named '{0}'</x:String>
   <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Track all *{0} files</x:String>
-  <x:String x:Key="Text.Histories" xml:space="preserve">Histories</x:String>
-  <x:String x:Key="Text.Histories.DisplayMode" xml:space="preserve">Switch Horizontal/Vertical Layout</x:String>
-  <x:String x:Key="Text.Histories.GraphMode" xml:space="preserve">Switch Curve/Polyline Graph Mode</x:String>
-  <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">AUTHOR</x:String>
-  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">GRAPH &amp; SUBJECT</x:String>
+  <x:String x:Key="Text.Histories" xml:space="preserve">Historique</x:String>
+  <x:String x:Key="Text.Histories.DisplayMode" xml:space="preserve">Basculer entre dispositions Horizontal/Vertical</x:String>
+  <x:String x:Key="Text.Histories.GraphMode" xml:space="preserve">Basculer en un graph courbe ou polyligne</x:String>
+  <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">AUTEUR</x:String>
+  <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">GRAPHE &amp; SUJET</x:String>
   <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">SHA</x:String>
-  <x:String x:Key="Text.Histories.Header.Time" xml:space="preserve">COMMIT TIME</x:String>
-  <x:String x:Key="Text.Histories.Search" xml:space="preserve">SEARCH SHA/SUBJECT/AUTHOR. PRESS ENTER TO SEARCH, ESC TO QUIT</x:String>
-  <x:String x:Key="Text.Histories.SearchClear" xml:space="preserve">CLEAR</x:String>
-  <x:String x:Key="Text.Histories.Selected" xml:space="preserve">SELECTED {0} COMMITS</x:String>
+  <x:String x:Key="Text.Histories.Header.Time" xml:space="preserve">HEURE DE COMMIT</x:String>
+  <x:String x:Key="Text.Histories.Search" xml:space="preserve">CHERCHER UN SHA/SUJET/AUTEUR. ENTRÉE POUR CHERCHER, ESC POUR QUITTER</x:String>
+  <x:String x:Key="Text.Histories.SearchClear" xml:space="preserve">EFFACER</x:String>
+  <x:String x:Key="Text.Histories.Selected" xml:space="preserve">{0} COMMITS SÉLECTIONNÉS</x:String>
   <x:String x:Key="Text.Hotkeys" xml:space="preserve">Référence des raccourcis clavier</x:String>
   <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">GLOBAL</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">Annuler le popup en cours</x:String>

From 6631611fa9064985432bca8c2d87db7922bc9002 Mon Sep 17 00:00:00 2001
From: UchiTesting <uchitesting57@gmail.com>
Date: Sat, 31 Aug 2024 22:14:55 +0200
Subject: [PATCH 17/21] style(locale): Translate a few sections

Diff.SyntaxHighlight
RevealFile
Revert
Reword
Running
Save
Stash
URL
UpdateSubmodules
Warn
WorkingCopy
Worktree

Some extra sentences

Include small fixes for
CodeEditor : missing accent
---
 src/Resources/Locales/fr_FR.axaml | 112 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 56 deletions(-)

diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 9ab1c322..cc91407b 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -96,7 +96,7 @@
   <x:String x:Key="Text.Clone.ParentFolder" xml:space="preserve">Dossier parent :</x:String>
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">URL du dépôt :</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">FERMER</x:String>
-  <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editeur</x:String>
+  <x:String x:Key="Text.CodeEditor" xml:space="preserve">Éditeur</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Cherry-Pick ce commit</x:String>
   <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Checkout ce commit</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Comparer avec HEAD</x:String>
@@ -204,7 +204,7 @@
   <x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">Diff côte-à-côte</x:String>
   <x:String x:Key="Text.Diff.Submodule" xml:space="preserve">SOUS-MODULE</x:String>
   <x:String x:Key="Text.Diff.Submodule.New" xml:space="preserve">NOUVEAU</x:String>
-  <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Syntax Highlighting</x:String>
+  <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Coloration syntaxique</x:String>
   <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">Retour à la ligne</x:String>
   <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Ouvrir dans l'outil de merge</x:String>
   <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">Réduit le nombre de ligne visibles</x:String>
@@ -515,16 +515,16 @@
   <x:String x:Key="Text.Reset.Mode" xml:space="preserve">Reset Mode:</x:String>
   <x:String x:Key="Text.Reset.MoveTo" xml:space="preserve">Move To:</x:String>
   <x:String x:Key="Text.Reset.Target" xml:space="preserve">Current Branch:</x:String>
-  <x:String x:Key="Text.RevealFile" xml:space="preserve">Reveal in File Explorer</x:String>
-  <x:String x:Key="Text.Revert" xml:space="preserve">Revert Commit</x:String>
-  <x:String x:Key="Text.Revert.Commit" xml:space="preserve">Commit:</x:String>
-  <x:String x:Key="Text.Revert.CommitChanges" xml:space="preserve">Commit revert changes</x:String>
-  <x:String x:Key="Text.Reword" xml:space="preserve">Reword Commit Message</x:String>
-  <x:String x:Key="Text.Reword.Tip" xml:space="preserve">Use 'Shift+Enter' to input a new line. 'Enter' is the hotkey of OK button</x:String>
-  <x:String x:Key="Text.Running" xml:space="preserve">Running. Please wait...</x:String>
-  <x:String x:Key="Text.Save" xml:space="preserve">SAVE</x:String>
-  <x:String x:Key="Text.SaveAs" xml:space="preserve">Save As...</x:String>
-  <x:String x:Key="Text.SaveAsPatchSuccess" xml:space="preserve">Patch has been saved successfully!</x:String>
+  <x:String x:Key="Text.RevealFile" xml:space="preserve">Ouvrir dans l'explorateur de fichier</x:String>
+  <x:String x:Key="Text.Revert" xml:space="preserve">Revert le Commit</x:String>
+  <x:String x:Key="Text.Revert.Commit" xml:space="preserve">Commit :</x:String>
+  <x:String x:Key="Text.Revert.CommitChanges" xml:space="preserve">Commit les changements du revert</x:String>
+  <x:String x:Key="Text.Reword" xml:space="preserve">Reformuler le message de commit</x:String>
+  <x:String x:Key="Text.Reword.Tip" xml:space="preserve">Utiliser 'Maj+Entrée' pour insérer une nouvelle ligne. 'Entrée' est la touche pour valider</x:String>
+  <x:String x:Key="Text.Running" xml:space="preserve">En exécution. Veuillez patienter...</x:String>
+  <x:String x:Key="Text.Save" xml:space="preserve">SAUVEGARDER</x:String>
+  <x:String x:Key="Text.SaveAs" xml:space="preserve">Sauvegarder en tant que...</x:String>
+  <x:String x:Key="Text.SaveAsPatchSuccess" xml:space="preserve">Le patch a été sauvegardé !</x:String>
   <x:String x:Key="Text.SelfUpdate" xml:space="preserve">Vérifier les mises à jour...</x:String>
   <x:String x:Key="Text.SelfUpdate.Available" xml:space="preserve">Une nouvelle version du logiciel est disponible :</x:String>
   <x:String x:Key="Text.SelfUpdate.Error" xml:space="preserve">La vérification de mise à jour à échouée !</x:String>
@@ -539,15 +539,15 @@
   <x:String x:Key="Text.Stash" xml:space="preserve">Stash</x:String>
   <x:String x:Key="Text.Stash.IncludeUntracked" xml:space="preserve">Include untracked files</x:String>
   <x:String x:Key="Text.Stash.Message" xml:space="preserve">Message:</x:String>
-  <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">Optional. Name of this stash</x:String>
-  <x:String x:Key="Text.Stash.Title" xml:space="preserve">Stash Local Changes</x:String>
-  <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Apply</x:String>
-  <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Drop</x:String>
-  <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Pop</x:String>
-  <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Drop Stash</x:String>
-  <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Drop:</x:String>
+  <x:String x:Key="Text.Stash.Message.Placeholder" xml:space="preserve">Optionnel. Nom de ce stash</x:String>
+  <x:String x:Key="Text.Stash.Title" xml:space="preserve">Stash les changements locaux</x:String>
+  <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Appliquer</x:String>
+  <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Effacer</x:String>
+  <x:String x:Key="Text.StashCM.Pop" xml:space="preserve">Extraire</x:String>
+  <x:String x:Key="Text.StashDropConfirm" xml:space="preserve">Effacer le Stash</x:String>
+  <x:String x:Key="Text.StashDropConfirm.Label" xml:space="preserve">Effacer :</x:String>
   <x:String x:Key="Text.Stashes" xml:space="preserve">Stashes</x:String>
-  <x:String x:Key="Text.Stashes.Changes" xml:space="preserve">CHANGES</x:String>
+  <x:String x:Key="Text.Stashes.Changes" xml:space="preserve">CHANGEMENTS</x:String>
   <x:String x:Key="Text.Stashes.Stashes" xml:space="preserve">STASHES</x:String>
   <x:String x:Key="Text.Statistics" xml:space="preserve">Statistics</x:String>
   <x:String x:Key="Text.Statistics.CommitAmount" xml:space="preserve">COMMITS</x:String>
@@ -569,14 +569,14 @@
   <x:String x:Key="Text.TagCM.Copy" xml:space="preserve">Copy Tag Name</x:String>
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Delete ${0}$...</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Push ${0}$...</x:String>
-  <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
-  <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Update Submodules</x:String>
-  <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">All submodules</x:String>
-  <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Initialize as needed</x:String>
-  <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Recursively</x:String>
-  <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Submodule:</x:String>
-  <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">Use --remote option</x:String>
-  <x:String x:Key="Text.Warn" xml:space="preserve">Warning</x:String>
+  <x:String x:Key="Text.URL" xml:space="preserve">URL :</x:String>
+  <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Actualiser les sous-modules</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Tous les sous-modules</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Initialiser au besoin</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Récursivement</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Sous-module :</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.UseRemote" xml:space="preserve">Utiliser l'option --remote</x:String>
+  <x:String x:Key="Text.Warn" xml:space="preserve">Avertissement</x:String>
   <x:String x:Key="Text.Welcome" xml:space="preserve">Page d'accueil</x:String>
   <x:String x:Key="Text.Welcome.AddRootFolder" xml:space="preserve">Créer un groupe</x:String>
   <x:String x:Key="Text.Welcome.AddSubFolder" xml:space="preserve">Créer un sous-groupe</x:String>
@@ -589,36 +589,36 @@
   <x:String x:Key="Text.Welcome.OpenTerminal" xml:space="preserve">Ouvrir le terminal</x:String>
   <x:String x:Key="Text.Welcome.Search" xml:space="preserve">Chercher des dépôts...</x:String>
   <x:String x:Key="Text.Welcome.Sort" xml:space="preserve">Trier</x:String>
-  <x:String x:Key="Text.WorkingCopy" xml:space="preserve">Changes</x:String>
+  <x:String x:Key="Text.WorkingCopy" xml:space="preserve">Changements</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore" xml:space="preserve">Git Ignore</x:String>
-  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.Extension" xml:space="preserve">Ignore all *{0} files</x:String>
-  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">Ignore *{0} files in the same folder</x:String>
-  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">Ignore files in the same folder</x:String>
-  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Ignore this file only</x:String>
-  <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Amend</x:String>
-  <x:String x:Key="Text.WorkingCopy.AutoStage" xml:space="preserve">Auto-Stage</x:String>
-  <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">You can stage this file now.</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.Extension" xml:space="preserve">Ignorer tous les *{0} fichiers</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">Ignorer *{0} fichiers dans le même dossier</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InSameFolder" xml:space="preserve">Ignorer les fichiers dans le même dossier</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">N'ignorer que ce fichier</x:String>
+  <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Amender</x:String>
+  <x:String x:Key="Text.WorkingCopy.AutoStage" xml:space="preserve">Auto-Index</x:String>
+  <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Vous pouvez indexer ce fichier.</x:String>
   <x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">COMMIT</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">Template/Histories</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">CTRL + Enter</x:String>
-  <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTS DETECTED</x:String>
-  <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">FILE CONFLICTS ARE RESOLVED</x:String>
-  <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLUDE UNTRACKED FILES</x:String>
-  <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">NO RECENT INPUT MESSAGES</x:String>
-  <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">NO COMMIT TEMPLATES</x:String>
-  <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">STAGED</x:String>
-  <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">UNSTAGE</x:String>
-  <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">UNSTAGE ALL</x:String>
-  <x:String x:Key="Text.WorkingCopy.Unstaged" xml:space="preserve">UNSTAGED</x:String>
-  <x:String x:Key="Text.WorkingCopy.Unstaged.Stage" xml:space="preserve">STAGE</x:String>
-  <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">STAGE ALL</x:String>
-  <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">VIEW ASSUME UNCHANGED</x:String>
-  <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">Template: ${0}$</x:String>
-  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Right-click the selected file(s), and make your choice to resolve conflicts.</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">Modèles/Historiques</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">CTRL + Entrée</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLITS DÉTECTÉS</x:String>
+  <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">LES CONFLITS DE FICHIER SONT RÉSOLUS</x:String>
+  <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">INCLURE LES FICHIERS NON-SUIVIS</x:String>
+  <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">PAS DE MESSAGE D'ENTRÉE RÉCENT</x:String>
+  <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">PAS DE MODÈLES DE COMMIT</x:String>
+  <x:String x:Key="Text.WorkingCopy.Staged" xml:space="preserve">INDEXÉ</x:String>
+  <x:String x:Key="Text.WorkingCopy.Staged.Unstage" xml:space="preserve">RETIRER DE L'INDEX</x:String>
+  <x:String x:Key="Text.WorkingCopy.Staged.UnstageAll" xml:space="preserve">RETIRER TOUT DE L'INDEX</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged" xml:space="preserve">NON INDEXÉ</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged.Stage" xml:space="preserve">INDEXER</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged.StageAll" xml:space="preserve">INDEXER TOUT</x:String>
+  <x:String x:Key="Text.WorkingCopy.Unstaged.ViewAssumeUnchaged" xml:space="preserve">VOIR LES FICHIERS PRÉSUMÉS INCHANGÉS</x:String>
+  <x:String x:Key="Text.WorkingCopy.UseCommitTemplate" xml:space="preserve">Modèle: ${0}$</x:String>
+  <x:String x:Key="Text.WorkingCopy.ResolveTip" xml:space="preserve">Faites un clique droit sur les fichiers sélectionnés et faites vos choix pour la résoluion des conflits.</x:String>
   <x:String x:Key="Text.Worktree" xml:space="preserve">WORKTREE</x:String>
-  <x:String x:Key="Text.Worktree.CopyPath" xml:space="preserve">Copy Path</x:String>
-  <x:String x:Key="Text.Worktree.Lock" xml:space="preserve">Lock</x:String>
-  <x:String x:Key="Text.Worktree.Remove" xml:space="preserve">Remove</x:String>
-  <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">Unlock</x:String>
+  <x:String x:Key="Text.Worktree.CopyPath" xml:space="preserve">Copier le chemin</x:String>
+  <x:String x:Key="Text.Worktree.Lock" xml:space="preserve">Verrouiller</x:String>
+  <x:String x:Key="Text.Worktree.Remove" xml:space="preserve">Supprimer</x:String>
+  <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">Déverrouiller</x:String>
 </ResourceDictionary>

From a77c6dba67c113e567333abaed201f7a23e22708 Mon Sep 17 00:00:00 2001
From: UchiTesting <uchitesting57@gmail.com>
Date: Sat, 7 Sep 2024 20:27:05 +0200
Subject: [PATCH 18/21] Fix case for Text.Configure.IssueTracker.RuleName

Capital letter in the beginning was missing.
---
 src/Resources/Locales/fr_FR.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index cc91407b..b9639064 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -138,7 +138,7 @@
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleJira" xml:space="preserve">Add Sample Jira Rule</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.NewRule" xml:space="preserve">Nouvelle règle</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.Regex" xml:space="preserve">Issue Regex Expression:</x:String>
-  <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">nom de règle :</x:String>
+  <x:String x:Key="Text.Configure.IssueTracker.RuleName" xml:space="preserve">Nom de règle :</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.URLTemplate" xml:space="preserve">URL résultant:</x:String>
   <!-- A vérifier -->
   <x:String x:Key="Text.Configure.IssueTracker.URLTemplate.Tip" xml:space="preserve">Please use $1, $2 to access regex groups values.</x:String>

From 668831971482d7203db8c978d9b1cf4229ad7ca4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 8 Sep 2024 18:29:05 +0800
Subject: [PATCH 19/21] fix: failed get default font on some Linux distro
 (#447)

---
 src/App.axaml.cs           | 2 +-
 src/Native/Linux.cs        | 7 +++++++
 src/Resources/Themes.axaml | 4 ++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index b64e65c0..cd00517f 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -75,7 +75,7 @@ namespace SourceGit
             AvaloniaXamlLoader.Load(this);
 
             var pref = ViewModels.Preference.Instance;
-            pref.PropertyChanged += (_1, _2) => pref.Save();
+            pref.PropertyChanged += (_, _) => pref.Save();
 
             SetLocale(pref.Locale);
             SetTheme(pref.Theme, pref.ThemeOverrides);
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index 1b33cc5d..59193e44 100644
--- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Runtime.Versioning;
 
 using Avalonia;
+using Avalonia.Media;
 
 namespace SourceGit.Native
 {
@@ -36,6 +37,12 @@ namespace SourceGit.Native
 
         public void SetupApp(AppBuilder builder)
         {
+            // Fix issue https://github.com/sourcegit-scm/sourcegit/issues/447
+            builder.With(new FontManagerOptions()
+            {
+                DefaultFamilyName = "fonts:SourceGit#JetBrains Mono",
+            });
+            
             builder.With(new X11PlatformOptions()
             {
                 EnableIme = true,
diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml
index 05cb9b50..2714c33e 100644
--- a/src/Resources/Themes.axaml
+++ b/src/Resources/Themes.axaml
@@ -99,6 +99,6 @@
   <SolidColorBrush x:Key="Brush.Link" Color="{DynamicResource Color.Link}"/>
 
   <FontFamily x:Key="Fonts.Default">$Default</FontFamily>
-  <FontFamily x:Key="Fonts.Monospace">fonts:SourceGit#JetBrains Mono,$Default</FontFamily>
-  <FontFamily x:Key="Fonts.Primary">fonts:SourceGit#JetBrains Mono,$Default</FontFamily>
+  <FontFamily x:Key="Fonts.Monospace">fonts:SourceGit#JetBrains Mono</FontFamily>
+  <FontFamily x:Key="Fonts.Primary">fonts:SourceGit#JetBrains Mono</FontFamily>
 </ResourceDictionary>

From 17dd32456bf1f6002556c69ea9e0518e007f96e0 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 9 Sep 2024 10:01:41 +0800
Subject: [PATCH 20/21] refactor: add `Avalonia.Fonts.Inter` as built-in
 default font (#447)

---
 src/App.axaml.cs           | 16 +++++++++++++---
 src/Native/Linux.cs        |  9 +--------
 src/Resources/Themes.axaml |  2 +-
 src/SourceGit.csproj       |  3 ++-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index cd00517f..a434fa5e 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -58,6 +58,7 @@ namespace SourceGit
             var builder = AppBuilder.Configure<App>();
             builder.UsePlatformDetect();
             builder.LogToTrace();
+            builder.WithInterFont();
             builder.ConfigureFonts(manager =>
             {
                 var monospace = new EmbeddedFontCollection(
@@ -219,9 +220,18 @@ namespace SourceGit
                 resDic.Add("Fonts.Monospace", new FontFamily(monospaceFont));
             }
 
-            var primary = onlyUseMonospaceFontInEditor ? defaultFont : monospaceFont;
-            if (!string.IsNullOrEmpty(primary))
-                resDic.Add("Fonts.Primary", new FontFamily(primary));
+            if (onlyUseMonospaceFontInEditor)
+            {
+                if (string.IsNullOrEmpty(defaultFont))
+                    resDic.Add("Fonts.Primary", new FontFamily("fonts:Inter#Inter, $Default"));
+                else
+                    resDic.Add("Fonts.Primary", new FontFamily(defaultFont));
+            }
+            else
+            {
+                if (!string.IsNullOrEmpty(monospaceFont))
+                    resDic.Add("Fonts.Primary", new FontFamily(monospaceFont));
+            }
 
             if (resDic.Count > 0)
             {
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index 59193e44..ca6e7c56 100644
--- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs
@@ -5,7 +5,6 @@ using System.IO;
 using System.Runtime.Versioning;
 
 using Avalonia;
-using Avalonia.Media;
 
 namespace SourceGit.Native
 {
@@ -36,13 +35,7 @@ namespace SourceGit.Native
         }
 
         public void SetupApp(AppBuilder builder)
-        {
-            // Fix issue https://github.com/sourcegit-scm/sourcegit/issues/447
-            builder.With(new FontManagerOptions()
-            {
-                DefaultFamilyName = "fonts:SourceGit#JetBrains Mono",
-            });
-            
+        {            
             builder.With(new X11PlatformOptions()
             {
                 EnableIme = true,
diff --git a/src/Resources/Themes.axaml b/src/Resources/Themes.axaml
index 2714c33e..5f8dca57 100644
--- a/src/Resources/Themes.axaml
+++ b/src/Resources/Themes.axaml
@@ -98,7 +98,7 @@
   <SolidColorBrush x:Key="Brush.Diff.DeletedHighlight" Color="{DynamicResource Color.Diff.DeletedHighlight}"/>
   <SolidColorBrush x:Key="Brush.Link" Color="{DynamicResource Color.Link}"/>
 
-  <FontFamily x:Key="Fonts.Default">$Default</FontFamily>
+  <FontFamily x:Key="Fonts.Default">fonts:Inter#Inter, $Default</FontFamily>
   <FontFamily x:Key="Fonts.Monospace">fonts:SourceGit#JetBrains Mono</FontFamily>
   <FontFamily x:Key="Fonts.Primary">fonts:SourceGit#JetBrains Mono</FontFamily>
 </ResourceDictionary>
diff --git a/src/SourceGit.csproj b/src/SourceGit.csproj
index 835185ab..9154bd2a 100644
--- a/src/SourceGit.csproj
+++ b/src/SourceGit.csproj
@@ -40,6 +40,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia" Version="11.1.3" />
     <PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.3" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
     <PackageReference Include="Avalonia.Diagnostics" Version="11.1.3" Condition="'$(Configuration)' == 'Debug'" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
@@ -55,6 +56,6 @@
   </ItemGroup>
 
   <ItemGroup Condition="$([MSBuild]::IsOSPlatform('OSX'))">
-    <LinkerArg Include="-mmacosx-version-min=11.0" Condition="'$(Configuration)' == 'Release'"/>
+    <LinkerArg Include="-mmacosx-version-min=11.0" Condition="'$(Configuration)' == 'Release'" />
   </ItemGroup>
 </Project>

From f3714cdc564c641ab267cce9fe25764bc494fc4a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 9 Sep 2024 10:04:55 +0800
Subject: [PATCH 21/21] version: Release 8.29

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 87641a66..74966804 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.28
\ No newline at end of file
+8.29
\ No newline at end of file