From dc4a8007de7a29d96d27bf406a5740a9f551ebb4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Apr 2024 14:22:37 +0800
Subject: [PATCH 01/27] ci: use lowercase executable file name on linux; build
 packages for both Intel and Apple Silicon CPU architecture on macOS (#97)

---
 .github/workflows/ci.yml | 87 ++++++++++++++++++++++++++++++++--------
 1 file changed, 70 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c8e1ea8e..4721601c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,21 +7,9 @@ on:
     branches: [develop]
   workflow_dispatch:
 jobs:
-  build:
-    name: Build
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            platform: linux-x64
-          - os: windows-latest
-            platform: win-x64
-          - os: macos-latest
-            platform: osx-x64
-          - os: macos-latest
-            platform: osx-arm64
-    runs-on: ${{ matrix.os }}
+  build-windows:
+    name: Build Windows x64
+    runs-on: windows-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -34,9 +22,74 @@ jobs:
       - name: Build
         run: dotnet build -c Release
       - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r ${{ matrix.platform }} -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r win-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.platform }}
+          name: sourcegit.win-x64
+          path: publish
+  build-macos-intel:
+    name: Build macOS (Intel)
+    runs-on: macos-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Build
+        run: dotnet build -c Release
+      - name: Publish
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: sourcegit.osx-x64
+          path: publish
+  build-macos-arm64:
+    name: Build macOS (Apple Silicon)
+    runs-on: macos-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Build
+        run: dotnet build -c Release
+      - name: Publish
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-arm64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: sourcegit.osx-arm64
+          path: publish
+  build-linux:
+    name: Build Linux
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Build
+        run: dotnet build -c Release
+      - name: Publish
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-arm64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+      - name: Rename Executable File
+        run: mv publish/SourceGit publish/sourcegit
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: sourcegit.linux-x64
           path: publish

From 7589a8dcd0745f477cc806bf1b003cd50ef785b4 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Apr 2024 14:25:24 +0800
Subject: [PATCH 02/27] ci: fix wrong runtime identifier for linux

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4721601c..983a837c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -85,7 +85,7 @@ jobs:
       - name: Build
         run: dotnet build -c Release
       - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-arm64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r linux-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
       - name: Rename Executable File
         run: mv publish/SourceGit publish/sourcegit
       - name: Upload Artifact

From 5e6059ba366d21532d340a40c44ed052aad6fe4a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Apr 2024 15:22:06 +0800
Subject: [PATCH 03/27] ux: hotkey tooltip in buttons

---
 src/Resources/Locales/en_US.axaml |  4 ++--
 src/Resources/Locales/zh_CN.axaml |  6 +++---
 src/Views/Launcher.axaml          | 19 +++++++++++++++----
 src/Views/Repository.axaml        |  9 +++++++--
 src/Views/WorkingCopy.axaml       | 16 ++++++++++++++--
 5 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index fed4f46b..0d7a3072 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -243,7 +243,7 @@
   <x:String x:Key="Text.OpenFolder" xml:space="preserve">SELECT FOLDER</x:String>
   <x:String x:Key="Text.OpenWith" xml:space="preserve">Open With ...</x:String>
   <x:String x:Key="Text.Optional" xml:space="preserve">Optional.</x:String>
-  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">Create New Page (Ctrl+T)</x:String>
+  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">Create New Page</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.Bookmark" xml:space="preserve">Bookmark</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.Close" xml:space="preserve">Close Tab</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CloseOther" xml:space="preserve">Close Other Tabs</x:String>
@@ -340,7 +340,7 @@
   <x:String x:Key="Text.Repository.Remotes" xml:space="preserve">REMOTES</x:String>
   <x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">ADD REMOTE</x:String>
   <x:String x:Key="Text.Repository.Resolve" xml:space="preserve">RESOLVE</x:String>
-  <x:String x:Key="Text.Repository.Search" xml:space="preserve">Search Commit (Ctrl+F)</x:String>
+  <x:String x:Key="Text.Repository.Search" xml:space="preserve">Search Commit</x:String>
   <x:String x:Key="Text.Repository.SearchTip" xml:space="preserve">Search Author/Committer/Message/SHA</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/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index c2500d54..1b817c3b 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -243,9 +243,9 @@
   <x:String x:Key="Text.OpenFolder" xml:space="preserve">选择文件夹</x:String>
   <x:String x:Key="Text.OpenWith" xml:space="preserve">打开文件...</x:String>
   <x:String x:Key="Text.Optional" xml:space="preserve">选填。</x:String>
-  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">新建空白页 (Ctrl+T)</x:String>
+  <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">新建空白页</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.Bookmark" xml:space="preserve">设置书签</x:String>
-  <x:String x:Key="Text.PageTabBar.Tab.Close" xml:space="preserve">关闭标签页 (Ctrl+W)</x:String>
+  <x:String x:Key="Text.PageTabBar.Tab.Close" xml:space="preserve">关闭标签页</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CloseOther" xml:space="preserve">关闭其他标签页</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CloseRight" xml:space="preserve">关闭右侧标签页</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.CopyPath" xml:space="preserve">复制仓库路径</x:String>
@@ -340,7 +340,7 @@
   <x:String x:Key="Text.Repository.Remotes" xml:space="preserve">远程列表</x:String>
   <x:String x:Key="Text.Repository.Remotes.Add" xml:space="preserve">添加远程</x:String>
   <x:String x:Key="Text.Repository.Resolve" xml:space="preserve">解决冲突</x:String>
-  <x:String x:Key="Text.Repository.Search" xml:space="preserve">查找提交(Ctrl+F)</x:String>
+  <x:String x:Key="Text.Repository.Search" xml:space="preserve">查找提交</x:String>
   <x:String x:Key="Text.Repository.SearchTip" 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/Views/Launcher.axaml b/src/Views/Launcher.axaml
index ab3e9dd0..5b6003dd 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -199,8 +199,13 @@
                               Classes="icon_button"
                               Width="16" Height="16" Margin="12,0"
                               Command="{Binding #me.DataContext.(vm:Launcher).CloseTab}"
-                              CommandParameter="{Binding}"
-                              ToolTip.Tip="{DynamicResource Text.PageTabBar.Tab.Close}">
+                              CommandParameter="{Binding}">
+                        <ToolTip.Tip>
+                          <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                            <TextBlock Text="{DynamicResource Text.PageTabBar.Tab.Close}" VerticalAlignment="Center"/>
+                            <TextBlock Margin="16,0,0,0" Text="Ctrl+W" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                          </StackPanel>
+                        </ToolTip.Tip>
                         <Path Width="8" Height="8" Data="{StaticResource Icons.Window.Close}"/>
                       </Button>
                       <Rectangle Grid.Column="2" Width=".5" Height="20" HorizontalAlignment="Right" VerticalAlignment="Center" Fill="{DynamicResource Brush.FG2}">
@@ -222,8 +227,14 @@
                     Width="16" Height="16"
                     Margin="8,0"
                     Command="{Binding AddNewTab}"
-                    HotKey="Ctrl+T"
-                    ToolTip.Tip="{DynamicResource Text.PageTabBar.New}">
+                    HotKey="Ctrl+T">
+              <ToolTip.Tip>
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                  <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>
+                  <TextBlock Margin="16,0,0,0" Text="Ctrl+T" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                </StackPanel>
+              </ToolTip.Tip>
+              
               <Path Width="12" Height="12" Data="{StaticResource Icons.Plus}"/>
             </Button>
           </StackPanel>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 9f450c77..8a0ec5ce 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -28,8 +28,13 @@
           
           <ToggleButton Width="32"
                         Background="Transparent"
-                        IsChecked="{Binding IsSearching, Mode=TwoWay}"
-                        ToolTip.Tip="{DynamicResource Text.Repository.Search}">
+                        IsChecked="{Binding IsSearching, Mode=TwoWay}">
+            <ToolTip.Tip>
+              <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                <TextBlock Text="{DynamicResource Text.Repository.Search}" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="Ctrl+F" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+              </StackPanel>
+            </ToolTip.Tip>
             <Path Width="14" Height="14" Data="{StaticResource Icons.Search}"/>
           </ToggleButton>
         </StackPanel>
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 57931284..0dded0ad 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -43,7 +43,13 @@
                   Classes="icon_button"
                   Width="26" Height="14"
                   Padding="0"
-                  ToolTip.Tip="{DynamicResource Text.WorkingCopy.Unstaged.Stage}" Click="StageSelected">
+                  Click="StageSelected">
+            <ToolTip.Tip>
+              <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                <TextBlock Text="{DynamicResource Text.WorkingCopy.Unstaged.Stage}" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="SPACE" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+              </StackPanel>
+            </ToolTip.Tip>
             <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
           </Button>
           <Button Grid.Column="8"
@@ -173,7 +179,13 @@
           <TextBlock Grid.Column="1" Text="{DynamicResource Text.WorkingCopy.Staged}" Foreground="{DynamicResource Brush.FG2}" FontWeight="Bold" Margin="8,0,0,0"/>
           <TextBlock Grid.Column="2" FontWeight="Bold" Foreground="{DynamicResource Brush.FG2}" Text="{Binding Staged, Converter={x:Static c:ListConverters.ToCount}}"/>
           <Path Grid.Column="3" Classes="rotating" Width="14" Height="14" Data="{StaticResource Icons.Loading}" Margin="8,0,0,0" IsVisible="{Binding IsUnstaging}"/>
-          <Button Grid.Column="5" Classes="icon_button" Width="26" Height="14" Padding="0" ToolTip.Tip="{DynamicResource Text.WorkingCopy.Staged.Unstage}" Click="UnstageSelected">
+          <Button Grid.Column="5" Classes="icon_button" Width="26" Height="14" Padding="0" Click="UnstageSelected">
+            <ToolTip.Tip>
+              <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                <TextBlock Text="{DynamicResource Text.WorkingCopy.Staged.Unstage}" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="SPACE" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+              </StackPanel>
+            </ToolTip.Tip>
             <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>
           </Button>
           <Button Grid.Column="6" Classes="icon_button" Width="26" Height="14" Padding="0" ToolTip.Tip="{DynamicResource Text.WorkingCopy.Staged.UnstageAll}" Click="UnstageAll">

From 927a1cab24bcd8c803bf5e952aff49e5a07af0d6 Mon Sep 17 00:00:00 2001
From: Alexander Bogomolets <bogomolets@owlcat.games>
Date: Sun, 28 Apr 2024 16:43:53 +0300
Subject: [PATCH 04/27] Add checkout local changes handling

This commit adds the local changes handling behavior for branch checkout.
One of three can be selected: stash and reapply after checkout, discard changes or leave them as is (previous behaviour)
---
 src/Resources/Locales/en_US.axaml |  4 ++
 src/Resources/Locales/zh_CN.axaml |  4 ++
 src/ViewModels/Checkout.cs        | 73 ++++++++++++++++++++++++++++++-
 src/ViewModels/Histories.cs       |  6 ++-
 src/ViewModels/Repository.cs      |  5 ++-
 src/Views/Checkout.axaml          | 12 +++++
 src/Views/Repository.axaml.cs     |  2 +-
 7 files changed, 101 insertions(+), 5 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 0d7a3072..dfe51cd4 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -53,6 +53,10 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Show as Tree</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">Checkout Branch</x:String>
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Target :</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Local Changes :</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges.Leave" xml:space="preserve">Leave</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick This Commit</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit :</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Commit all changes</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 1b817c3b..217dbf7f 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -53,6 +53,10 @@
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">树形模式</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">检出(checkout)分支</x:String>
   <x:String x:Key="Text.Checkout.Target" xml:space="preserve">目标分支 ：</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">未提交更改 ：</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">贮藏(stash)并自动恢复</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">忽略</x:String>
+  <x:String x:Key="Text.Checkout.LocalChanges.Leave" xml:space="preserve">保持原样</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">挑选(cherry-pick)此提交</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">提交ID ：</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">提交变化</x:String>
diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs
index adfc70db..327253cf 100644
--- a/src/ViewModels/Checkout.cs
+++ b/src/ViewModels/Checkout.cs
@@ -9,27 +9,98 @@ namespace SourceGit.ViewModels
             get;
             private set;
         }
+        
+        public bool HasLocalChanges
+        {
+            get => _repo.WorkingCopyChangesCount > 0;
+        }
+
+        public bool LeaveLocalChanges
+        {
+            get => _leaveLocalChanges;
+            set => SetProperty(ref _leaveLocalChanges, value);
+        }
+
+        public bool DiscardLocalChanges
+        {
+            get => _discardLocalChanges;
+            set => SetProperty(ref _discardLocalChanges, value);
+        }
+
+        public bool StashLocalChanges
+        {
+            get => _stashLocalChanges;
+            set => SetProperty(ref _stashLocalChanges, value);
+        }
 
         public Checkout(Repository repo, string branch)
         {
             _repo = repo;
             Branch = branch;
             View = new Views.Checkout() { DataContext = this };
+
+            StashLocalChanges = true;
         }
 
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
             ProgressDescription = $"Checkout '{Branch}' ...";
+            var hasLocalChanges = HasLocalChanges;
 
             return Task.Run(() =>
             {
-                var succ = new Commands.Checkout(_repo.FullPath).Branch(Branch, SetProgressDescription);
+                var succ = false;
+                if (hasLocalChanges)
+                {
+                    if (DiscardLocalChanges)
+                    {
+                        SetProgressDescription("Discard local changes...");
+                        Commands.Discard.All(_repo.FullPath);
+                    }
+
+                    if (StashLocalChanges)
+                    {
+                        SetProgressDescription("Stash local changes...");
+                        succ = new Commands.Add(_repo.FullPath).Exec();
+                        succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH");
+                    }
+                }
+                
+                SetProgressDescription("Checkout branch ...");
+                succ = new Commands.Checkout(_repo.FullPath).Branch(Branch, SetProgressDescription);
+                
+                if(hasLocalChanges && StashLocalChanges)
+                {
+                    SetProgressDescription("Re-apply local changes...");
+                    succ = new Commands.Stash(_repo.FullPath).Apply("stash@{0}");
+                    if (succ)
+                    {
+                        succ = new Commands.Stash(_repo.FullPath).Drop("stash@{0}");
+                    }
+                }
+                
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
                 return succ;
             });
         }
+        
+        public static void ShowPopup(Repository repo, string branch)
+        {
+            var checkout = new Checkout(repo, branch);
+            if (repo.WorkingCopyChangesCount > 0)
+            {
+                PopupHost.ShowPopup(checkout);   
+            }
+            else
+            {
+                PopupHost.ShowAndStartPopup(checkout);
+            }
+        }
 
         private readonly Repository _repo;
+        private bool _leaveLocalChanges;
+        private bool _discardLocalChanges;
+        private bool _stashLocalChanges;
     }
 }
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index a4102543..4fc1e1b9 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -448,7 +448,9 @@ namespace SourceGit.ViewModels
             checkout.Click += (o, e) =>
             {
                 if (PopupHost.CanCreatePopup())
-                    PopupHost.ShowAndStartPopup(new Checkout(_repo, branch.Name));
+                {
+                    Checkout.ShowPopup(_repo, branch.Name);
+                }
                 e.Handled = true;
             };
             submenu.Items.Add(checkout);
@@ -527,7 +529,7 @@ namespace SourceGit.ViewModels
                         if (b.IsCurrent)
                             return;
                         if (PopupHost.CanCreatePopup())
-                            PopupHost.ShowAndStartPopup(new Checkout(_repo, b.Name));
+                            Checkout.ShowPopup(_repo, b.Name);
                         return;
                     }
                 }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index db35f4a9..fe99b0ec 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -843,7 +843,10 @@ namespace SourceGit.ViewModels
                 checkout.Click += (o, e) =>
                 {
                     if (PopupHost.CanCreatePopup())
-                        PopupHost.ShowAndStartPopup(new Checkout(this, branch.Name));
+                    {
+                        Checkout.ShowPopup(this, branch.Name);
+                    }
+                    
                     e.Handled = true;
                 };
                 menu.Items.Add(checkout);
diff --git a/src/Views/Checkout.axaml b/src/Views/Checkout.axaml
index 083190f8..50bb3b8c 100644
--- a/src/Views/Checkout.axaml
+++ b/src/Views/Checkout.axaml
@@ -15,5 +15,17 @@
       <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
       <TextBlock Text="{Binding Branch}"/>
     </StackPanel>
+    <StackPanel Orientation="Vertical" IsVisible="{Binding HasLocalChanges}">
+      <TextBlock Text="{DynamicResource Text.Checkout.LocalChanges}"/>
+      <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.StashAndReply}"
+                   GroupName="LocalChanges"
+                   IsChecked="{Binding StashLocalChanges, Mode=TwoWay }"/>
+      <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.Discard}"
+                   GroupName="LocalChanges"
+                   IsChecked="{Binding DiscardLocalChanges, Mode=TwoWay}"/>
+      <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.Leave}"
+                   GroupName="LocalChanges"
+                   IsChecked="{Binding LeaveLocalChanges, Mode=TwoWay}"/>
+    </StackPanel>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 43d9ee11..0d010cc0 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -298,7 +298,7 @@ namespace SourceGit.Views
                     if (branch.IsCurrent)
                         return;
 
-                    ViewModels.PopupHost.ShowAndStartPopup(new ViewModels.Checkout(repo, branch.Name));
+                    ViewModels.Checkout.ShowPopup(repo, branch.Name);
                     e.Handled = true;
                 }
             }

From 776605cb68145cc323b8ccc04dc3e446eceeb43f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Apr 2024 17:22:22 +0800
Subject: [PATCH 05/27] code_review: PR #98

* remove the `Leave` option (it may lead to an undefined behaviour), so user can only choose `Stash & reapply` or `Discard`.
* re-design the UI
* remove unused resources
---
 src/Resources/Locales/en_US.axaml |  3 +-
 src/Resources/Locales/zh_CN.axaml |  1 -
 src/ViewModels/Checkout.cs        | 87 ++++++++++++-------------------
 src/ViewModels/Histories.cs       | 13 ++---
 src/ViewModels/Repository.cs      | 17 ++++--
 src/Views/Checkout.axaml          | 41 +++++++++------
 src/Views/Repository.axaml.cs     |  2 +-
 7 files changed, 75 insertions(+), 89 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index dfe51cd4..0f3fac65 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -52,11 +52,10 @@
   <x:String x:Key="Text.ChangeDisplayMode.List" xml:space="preserve">Show as List</x:String>
   <x:String x:Key="Text.ChangeDisplayMode.Tree" xml:space="preserve">Show as Tree</x:String>
   <x:String x:Key="Text.Checkout" xml:space="preserve">Checkout Branch</x:String>
-  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Target :</x:String>
+  <x:String x:Key="Text.Checkout.Target" xml:space="preserve">Branch :</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">Local Changes :</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">Stash &amp; Reapply</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">Discard</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.Leave" xml:space="preserve">Leave</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry-Pick This Commit</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit :</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">Commit all changes</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 217dbf7f..a5c487b3 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -56,7 +56,6 @@
   <x:String x:Key="Text.Checkout.LocalChanges" xml:space="preserve">未提交更改 ：</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.StashAndReply" xml:space="preserve">贮藏(stash)并自动恢复</x:String>
   <x:String x:Key="Text.Checkout.LocalChanges.Discard" xml:space="preserve">忽略</x:String>
-  <x:String x:Key="Text.Checkout.LocalChanges.Leave" xml:space="preserve">保持原样</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">挑选(cherry-pick)此提交</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">提交ID ：</x:String>
   <x:String x:Key="Text.CherryPick.CommitChanges" xml:space="preserve">提交变化</x:String>
diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs
index 327253cf..3ee4b6de 100644
--- a/src/ViewModels/Checkout.cs
+++ b/src/ViewModels/Checkout.cs
@@ -9,28 +9,11 @@ namespace SourceGit.ViewModels
             get;
             private set;
         }
-        
-        public bool HasLocalChanges
-        {
-            get => _repo.WorkingCopyChangesCount > 0;
-        }
 
-        public bool LeaveLocalChanges
+        public bool AutoStash
         {
-            get => _leaveLocalChanges;
-            set => SetProperty(ref _leaveLocalChanges, value);
-        }
-
-        public bool DiscardLocalChanges
-        {
-            get => _discardLocalChanges;
-            set => SetProperty(ref _discardLocalChanges, value);
-        }
-
-        public bool StashLocalChanges
-        {
-            get => _stashLocalChanges;
-            set => SetProperty(ref _stashLocalChanges, value);
+            get => _autoStash;
+            set => SetProperty(ref _autoStash, value);
         }
 
         public Checkout(Repository repo, string branch)
@@ -38,69 +21,63 @@ namespace SourceGit.ViewModels
             _repo = repo;
             Branch = branch;
             View = new Views.Checkout() { DataContext = this };
-
-            StashLocalChanges = true;
         }
 
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
             ProgressDescription = $"Checkout '{Branch}' ...";
-            var hasLocalChanges = HasLocalChanges;
 
+            var hasLocalChanges = _repo.WorkingCopyChangesCount > 0;
             return Task.Run(() =>
             {
-                var succ = false;
+                var needPopStash = false;
                 if (hasLocalChanges)
                 {
-                    if (DiscardLocalChanges)
+                    if (AutoStash)
                     {
-                        SetProgressDescription("Discard local changes...");
-                        Commands.Discard.All(_repo.FullPath);
-                    }
+                        SetProgressDescription("Adding untracked changes ...");
+                        var succ = new Commands.Add(_repo.FullPath).Exec();
+                        if (succ)
+                        {
+                            SetProgressDescription("Stash local changes ...");
+                            succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH");
+                        }
 
-                    if (StashLocalChanges)
+                        if (!succ)
+                        {
+                            CallUIThread(() => _repo.SetWatcherEnabled(true));
+                            return false;
+                        }
+
+                        needPopStash = true;
+                    }
+                    else
                     {
-                        SetProgressDescription("Stash local changes...");
-                        succ = new Commands.Add(_repo.FullPath).Exec();
-                        succ = new Commands.Stash(_repo.FullPath).Push("CHECKOUT_AUTO_STASH");
+                        SetProgressDescription("Discard local changes ...");
+                        Commands.Discard.All(_repo.FullPath);
                     }
                 }
                 
                 SetProgressDescription("Checkout branch ...");
-                succ = new Commands.Checkout(_repo.FullPath).Branch(Branch, SetProgressDescription);
+                var rs = new Commands.Checkout(_repo.FullPath).Branch(Branch, SetProgressDescription);
                 
-                if(hasLocalChanges && StashLocalChanges)
+                if(needPopStash)
                 {
                     SetProgressDescription("Re-apply local changes...");
-                    succ = new Commands.Stash(_repo.FullPath).Apply("stash@{0}");
-                    if (succ)
+                    rs = new Commands.Stash(_repo.FullPath).Apply("stash@{0}");
+                    if (rs)
                     {
-                        succ = new Commands.Stash(_repo.FullPath).Drop("stash@{0}");
+                        rs = new Commands.Stash(_repo.FullPath).Drop("stash@{0}");
                     }
                 }
                 
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
-                return succ;
+                return rs;
             });
         }
-        
-        public static void ShowPopup(Repository repo, string branch)
-        {
-            var checkout = new Checkout(repo, branch);
-            if (repo.WorkingCopyChangesCount > 0)
-            {
-                PopupHost.ShowPopup(checkout);   
-            }
-            else
-            {
-                PopupHost.ShowAndStartPopup(checkout);
-            }
-        }
 
-        private readonly Repository _repo;
-        private bool _leaveLocalChanges;
-        private bool _discardLocalChanges;
-        private bool _stashLocalChanges;
+        private readonly Repository _repo = null;
+        private bool _autoStash = true;
     }
 }
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 4fc1e1b9..652ba805 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -447,10 +447,7 @@ namespace SourceGit.ViewModels
             checkout.Icon = App.CreateMenuIcon("Icons.Check");
             checkout.Click += (o, e) =>
             {
-                if (PopupHost.CanCreatePopup())
-                {
-                    Checkout.ShowPopup(_repo, branch.Name);
-                }
+                _repo.CheckoutLocalBranch(branch.Name);
                 e.Handled = true;
             };
             submenu.Items.Add(checkout);
@@ -526,16 +523,16 @@ namespace SourceGit.ViewModels
                 {
                     if (b.IsLocal && b.Upstream == branch.FullName)
                     {
-                        if (b.IsCurrent)
-                            return;
-                        if (PopupHost.CanCreatePopup())
-                            Checkout.ShowPopup(_repo, b.Name);
+                        if (!b.IsCurrent)
+                            _repo.CheckoutLocalBranch(b.Name);
+
                         return;
                     }
                 }
 
                 if (PopupHost.CanCreatePopup())
                     PopupHost.ShowPopup(new CreateBranch(_repo, branch));
+
                 e.Handled = true;
             };
             submenu.Items.Add(checkout);
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index fe99b0ec..949323cb 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -690,6 +690,17 @@ namespace SourceGit.ViewModels
                 PopupHost.ShowPopup(new CreateBranch(this, current));
         }
 
+        public void CheckoutLocalBranch(string branch)
+        {
+            if (!PopupHost.CanCreatePopup())
+                return;
+
+            if (WorkingCopyChangesCount > 0)
+                PopupHost.ShowPopup(new Checkout(this, branch));
+            else
+                PopupHost.ShowAndStartPopup(new Checkout(this, branch));
+        }
+
         public void CreateNewTag()
         {
             var current = Branches.Find(x => x.IsCurrent);
@@ -842,11 +853,7 @@ namespace SourceGit.ViewModels
                 checkout.Icon = App.CreateMenuIcon("Icons.Check");
                 checkout.Click += (o, e) =>
                 {
-                    if (PopupHost.CanCreatePopup())
-                    {
-                        Checkout.ShowPopup(this, branch.Name);
-                    }
-                    
+                    CheckoutLocalBranch(branch.Name);                    
                     e.Handled = true;
                 };
                 menu.Items.Add(checkout);
diff --git a/src/Views/Checkout.axaml b/src/Views/Checkout.axaml
index 50bb3b8c..51798fcc 100644
--- a/src/Views/Checkout.axaml
+++ b/src/Views/Checkout.axaml
@@ -10,22 +10,29 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.Checkout}"/>
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
-      <TextBlock Text="{DynamicResource Text.Checkout.Target}"/>
-      <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
-      <TextBlock Text="{Binding Branch}"/>
-    </StackPanel>
-    <StackPanel Orientation="Vertical" IsVisible="{Binding HasLocalChanges}">
-      <TextBlock Text="{DynamicResource Text.Checkout.LocalChanges}"/>
-      <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.StashAndReply}"
-                   GroupName="LocalChanges"
-                   IsChecked="{Binding StashLocalChanges, Mode=TwoWay }"/>
-      <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.Discard}"
-                   GroupName="LocalChanges"
-                   IsChecked="{Binding DiscardLocalChanges, Mode=TwoWay}"/>
-      <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.Leave}"
-                   GroupName="LocalChanges"
-                   IsChecked="{Binding LeaveLocalChanges, Mode=TwoWay}"/>
-    </StackPanel>
+
+    <Grid Margin="0,16,0,0" RowDefinitions="32,32" ColumnDefinitions="150,*">
+      <TextBlock Grid.Row="0" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Checkout.Target}"/>
+      <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
+        <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
+        <TextBlock Text="{Binding Branch}"/>
+      </StackPanel>
+
+      <TextBlock Grid.Row="1" Grid.Column="0"
+                 HorizontalAlignment="Right" VerticalAlignment="Center"
+                 Margin="0,0,8,0"
+                 Text="{DynamicResource Text.Checkout.LocalChanges}"/>
+      <StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
+        <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.StashAndReply}"
+                     GroupName="LocalChanges"
+                     IsChecked="{Binding AutoStash, Mode=TwoWay}"/>
+        <RadioButton Content="{DynamicResource Text.Checkout.LocalChanges.Discard}"
+                     GroupName="LocalChanges"
+                     Margin="8,0,0,0"/>
+      </StackPanel>
+    </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Repository.axaml.cs b/src/Views/Repository.axaml.cs
index 0d010cc0..717cc947 100644
--- a/src/Views/Repository.axaml.cs
+++ b/src/Views/Repository.axaml.cs
@@ -298,7 +298,7 @@ namespace SourceGit.Views
                     if (branch.IsCurrent)
                         return;
 
-                    ViewModels.Checkout.ShowPopup(repo, branch.Name);
+                    repo.CheckoutLocalBranch(branch.Name);
                     e.Handled = true;
                 }
             }

From 09b8564636c0d76365d9f5a4fb3e1f0871e1329d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Apr 2024 17:36:00 +0800
Subject: [PATCH 06/27] ux: left margin of branch icon

---
 src/Views/Checkout.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/Checkout.axaml b/src/Views/Checkout.axaml
index 51798fcc..5974db46 100644
--- a/src/Views/Checkout.axaml
+++ b/src/Views/Checkout.axaml
@@ -17,7 +17,7 @@
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.Checkout.Target}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
-        <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
+        <Path Width="14" Height="14" Margin="4,0" Data="{StaticResource Icons.Branch}"/>
         <TextBlock Text="{Binding Branch}"/>
       </StackPanel>
 

From a5150edee0bb6b82e2e287317ba085b9b505450b Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 29 Apr 2024 17:55:38 +0800
Subject: [PATCH 07/27] code_style: rename `platform_finder` to
 `platformFinder` and run `dotnet format` to apply code style rules

---
 src/Commands/IsConflictResolved.cs |  2 +-
 src/Converters/BoolConverters.cs   |  2 +-
 src/Models/ExternalTool.cs         | 20 ++++++++++----------
 src/ViewModels/Checkout.cs         |  8 ++++----
 src/ViewModels/Repository.cs       |  2 +-
 src/Views/TextDiffView.axaml.cs    |  6 ++++--
 6 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/Commands/IsConflictResolved.cs b/src/Commands/IsConflictResolved.cs
index 49bc56fa..6b0182dc 100644
--- a/src/Commands/IsConflictResolved.cs
+++ b/src/Commands/IsConflictResolved.cs
@@ -2,7 +2,7 @@
 {
     public class IsConflictResolved : Command
     {
-        public IsConflictResolved(string repo, Models.Change change) 
+        public IsConflictResolved(string repo, Models.Change change)
         {
             var opt = new Models.DiffOption(change, true);
 
diff --git a/src/Converters/BoolConverters.cs b/src/Converters/BoolConverters.cs
index 0a7d2aa1..7ddb4637 100644
--- a/src/Converters/BoolConverters.cs
+++ b/src/Converters/BoolConverters.cs
@@ -8,7 +8,7 @@ namespace SourceGit.Converters
         public static readonly FuncValueConverter<bool, double> HalfIfFalse =
             new FuncValueConverter<bool, double>(x => x ? 1 : 0.5);
 
-        public static readonly FuncValueConverter<bool, FontWeight> BoldIfTrue = 
+        public static readonly FuncValueConverter<bool, FontWeight> BoldIfTrue =
             new FuncValueConverter<bool, FontWeight>(x => x ? FontWeight.Bold : FontWeight.Regular);
     }
 }
diff --git a/src/Models/ExternalTool.cs b/src/Models/ExternalTool.cs
index 2b49fae0..c130fbcf 100644
--- a/src/Models/ExternalTool.cs
+++ b/src/Models/ExternalTool.cs
@@ -116,31 +116,31 @@ namespace SourceGit.Models
             });
         }
 
-        public void VSCode(Func<string> platform_finder)
+        public void VSCode(Func<string> platformFinder)
         {
-            TryAdd("Visual Studio Code", "vscode", "\"{0}\"", "VSCODE_PATH", platform_finder);
+            TryAdd("Visual Studio Code", "vscode", "\"{0}\"", "VSCODE_PATH", platformFinder);
         }
 
-        public void VSCodeInsiders(Func<string> platform_finder)
+        public void VSCodeInsiders(Func<string> platformFinder)
         {
-            TryAdd("Visual Studio Code - Insiders", "vscode_insiders", "\"{0}\"", "VSCODE_INSIDERS_PATH", platform_finder);
+            TryAdd("Visual Studio Code - Insiders", "vscode_insiders", "\"{0}\"", "VSCODE_INSIDERS_PATH", platformFinder);
         }
 
-        public void Fleet(Func<string> platform_finder)
+        public void Fleet(Func<string> platformFinder)
         {
-            TryAdd("Fleet", "fleet", "\"{0}\"", "FLEET_PATH", platform_finder);
+            TryAdd("Fleet", "fleet", "\"{0}\"", "FLEET_PATH", platformFinder);
         }
 
-        public void SublimeText(Func<string> platform_finder)
+        public void SublimeText(Func<string> platformFinder)
         {
-            TryAdd("Sublime Text", "sublime_text", "\"{0}\"", "SUBLIME_TEXT_PATH", platform_finder);
+            TryAdd("Sublime Text", "sublime_text", "\"{0}\"", "SUBLIME_TEXT_PATH", platformFinder);
         }
 
-        public void FindJetBrainsFromToolbox(Func<string> platform_finder)
+        public void FindJetBrainsFromToolbox(Func<string> platformFinder)
         {
             var exclude = new List<string> { "fleet", "dotmemory", "dottrace", "resharper-u", "androidstudio" };
             var supported_icons = new List<string> { "CL", "DB", "DL", "DS", "GO", "IC", "IU", "JB", "PC", "PS", "PY", "QA", "QD", "RD", "RM", "RR", "WRS", "WS" };
-            var state = Path.Combine(platform_finder(), "state.json");
+            var state = Path.Combine(platformFinder(), "state.json");
             if (File.Exists(state))
             {
                 var stateData = JsonSerializer.Deserialize(File.ReadAllText(state), JsonCodeGen.Default.JetBrainsState);
diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs
index 3ee4b6de..82f97c96 100644
--- a/src/ViewModels/Checkout.cs
+++ b/src/ViewModels/Checkout.cs
@@ -58,11 +58,11 @@ namespace SourceGit.ViewModels
                         Commands.Discard.All(_repo.FullPath);
                     }
                 }
-                
+
                 SetProgressDescription("Checkout branch ...");
                 var rs = new Commands.Checkout(_repo.FullPath).Branch(Branch, SetProgressDescription);
-                
-                if(needPopStash)
+
+                if (needPopStash)
                 {
                     SetProgressDescription("Re-apply local changes...");
                     rs = new Commands.Stash(_repo.FullPath).Apply("stash@{0}");
@@ -71,7 +71,7 @@ namespace SourceGit.ViewModels
                         rs = new Commands.Stash(_repo.FullPath).Drop("stash@{0}");
                     }
                 }
-                
+
                 CallUIThread(() => _repo.SetWatcherEnabled(true));
                 return rs;
             });
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 949323cb..73a500b5 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -853,7 +853,7 @@ namespace SourceGit.ViewModels
                 checkout.Icon = App.CreateMenuIcon("Icons.Check");
                 checkout.Click += (o, e) =>
                 {
-                    CheckoutLocalBranch(branch.Name);                    
+                    CheckoutLocalBranch(branch.Name);
                     e.Handled = true;
                 };
                 menu.Items.Add(checkout);
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
index 3969c1b7..bdb8edc6 100644
--- a/src/Views/TextDiffView.axaml.cs
+++ b/src/Views/TextDiffView.axaml.cs
@@ -686,12 +686,14 @@ namespace SourceGit.Views
 
         private void OnTextAreaPointerWheelChanged(object sender, PointerWheelEventArgs e)
         {
-            if (!TextArea.IsFocused) Focus();
+            if (!TextArea.IsFocused)
+                Focus();
         }
 
         private void OnTextViewScrollChanged(object sender, ScrollChangedEventArgs e)
         {
-            if (TextArea.IsFocused) SetCurrentValue(SyncScrollOffsetProperty, _scrollViewer.Offset);
+            if (TextArea.IsFocused)
+                SetCurrentValue(SyncScrollOffsetProperty, _scrollViewer.Offset);
         }
 
         private void OnTextViewContextRequested(object sender, ContextRequestedEventArgs e)

From 9c6798ef1b39bcaa0e6c88bbcdd402df94f8d91e Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Tue, 30 Apr 2024 21:50:30 +0800
Subject: [PATCH 08/27] fix: Fixed the issue when the email address is too long
 and exceeds the scope of the StackPanel

---
 src/Converters/BoolConverters.cs |  6 +++-
 src/Views/CommitBaseInfo.axaml   | 54 ++++++++++++++++++--------------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/src/Converters/BoolConverters.cs b/src/Converters/BoolConverters.cs
index 7ddb4637..02b9df8b 100644
--- a/src/Converters/BoolConverters.cs
+++ b/src/Converters/BoolConverters.cs
@@ -1,4 +1,5 @@
-using Avalonia.Data.Converters;
+using Avalonia.Controls;
+using Avalonia.Data.Converters;
 using Avalonia.Media;
 
 namespace SourceGit.Converters
@@ -10,5 +11,8 @@ namespace SourceGit.Converters
 
         public static readonly FuncValueConverter<bool, FontWeight> BoldIfTrue =
             new FuncValueConverter<bool, FontWeight>(x => x ? FontWeight.Bold : FontWeight.Regular);
+
+        public static readonly FuncValueConverter<bool, GridLength> BoolToStarOrAutoGridLength =
+            new(value => value ? new GridLength(1, GridUnitType.Star) : new GridLength(1, GridUnitType.Auto));
     }
 }
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index 4b257516..37375319 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -12,34 +12,42 @@
     <DataTemplate DataType="m:Commit">
       <StackPanel Orientation="Vertical">
         <!-- Author & Committer -->
-        <Grid ColumnDefinitions="96,*,96,*" Margin="0,8">
+        <Grid Margin="0,8">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="{Binding IsCommitterVisible, Converter={x:Static c:BoolConverters.BoolToStarOrAutoGridLength}}"/>
+            <ColumnDefinition Width="*"/>
+          </Grid.ColumnDefinitions>
           <!-- Author -->
-          <v:Avatar Grid.Column="0" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Author}"/>
-          <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
-            <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.CommitDetail.Info.Author}"/>
-            <StackPanel Orientation="Horizontal" Margin="0,10,0,8">
-              <SelectableTextBlock Text="{Binding Author.Name}" Margin="2,0,8,0"/>
-              <SelectableTextBlock Text="{Binding Author.Email}" Foreground="{DynamicResource Brush.FG2}"/>
+          <Grid Grid.Column="0" ColumnDefinitions="96,*">
+            <v:Avatar Grid.Column="0" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Author}"/>
+            <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
+              <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.CommitDetail.Info.Author}"/>
+              <DockPanel Margin="0,10,0,8" ClipToBounds="True">
+                <SelectableTextBlock Text="{Binding Author.Name}" Margin="2,0,8,0"/>
+                <SelectableTextBlock Text="{Binding Author.Email}" ToolTip.Tip="{Binding Author.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
+              </DockPanel>
+              <SelectableTextBlock Text="{Binding AuthorTimeStr}" 
+                                   Margin="2,0,0,0"
+                                   FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Decrease}}" 
+                                   Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
-            <SelectableTextBlock Text="{Binding AuthorTimeStr}" 
-                                 Margin="2,0,0,0"
-                                 FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Decrease}}" 
-                                 Foreground="{DynamicResource Brush.FG2}"/>
-          </StackPanel>
+          </Grid>
 
           <!-- Committer -->
-          <v:Avatar Grid.Column="2" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Committer}" IsVisible="{Binding IsCommitterVisible}"/>
-          <StackPanel Grid.Column="3" Margin="16,0,8,0" Orientation="Vertical" IsVisible="{Binding IsCommitterVisible}">
-            <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.CommitDetail.Info.Committer}"/>
-            <StackPanel Orientation="Horizontal" Margin="0,10,0,8">
-              <SelectableTextBlock Text="{Binding Committer.Name}" Margin="2,0,8,0"/>
-              <SelectableTextBlock Text="{Binding Committer.Email}" Foreground="{DynamicResource Brush.FG2}"/>
+          <Grid Grid.Column="1" ColumnDefinitions="96,*" IsVisible="{Binding IsCommitterVisible}">
+            <v:Avatar Grid.Column="0" Width="64" Height="64" HorizontalAlignment="Right" User="{Binding Committer}"/>
+            <StackPanel Grid.Column="1" Margin="16,0,8,0" Orientation="Vertical">
+              <TextBlock Classes="group_header_label" Margin="0" Text="{DynamicResource Text.CommitDetail.Info.Committer}"/>
+              <DockPanel Margin="0,10,0,8" ClipToBounds="True">
+                <SelectableTextBlock Text="{Binding Committer.Name}" Margin="2,0,8,0"/>
+                <SelectableTextBlock Text="{Binding Committer.Email}" ToolTip.Tip="{Binding Committer.Email}" Foreground="{DynamicResource Brush.FG2}" TextTrimming="CharacterEllipsis"/>
+              </DockPanel>
+              <SelectableTextBlock Text="{Binding CommitterTimeStr}" 
+                                   Margin="2,0,0,0" 
+                                   FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Decrease}}"
+                                   Foreground="{DynamicResource Brush.FG2}"/>
             </StackPanel>
-            <SelectableTextBlock Text="{Binding CommitterTimeStr}" 
-                                 Margin="2,0,0,0" 
-                                 FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Decrease}}"
-                                 Foreground="{DynamicResource Brush.FG2}"/>
-          </StackPanel>
+          </Grid>
         </Grid>
 
         <!-- Line -->

From e5049c04fc6c9f1a33cde71348697e3ac7888045 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Tue, 30 Apr 2024 21:58:09 +0800
Subject: [PATCH 09/27] build: copy .icns file into Linux archive

---
 build/build.linux.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build/build.linux.sh b/build/build.linux.sh
index 080341bf..ed819910 100644
--- a/build/build.linux.sh
+++ b/build/build.linux.sh
@@ -8,10 +8,12 @@ rm -rf SourceGit *.tar.gz resources/deb/opt *.deb *.rpm
 # Compile
 dotnet publish ../src/SourceGit.csproj -c Release -r linux-x64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
 mv SourceGit/SourceGit SourceGit/sourcegit
+cp resources/app/App.icns SourceGit/sourcegit.icns
 rm -f SourceGit/*.dbg
 
 # General Linux archive
 tar -zcvf sourcegit_${version}.linux-x64.tar.gz SourceGit
+rm -f SourceGit/sourcegit.icns
 
 # Debain/Ubuntu package
 mkdir -p resources/deb/opt/sourcegit/

From 9ae926db9fa6b942b7b331a4d41663781e2c9b8a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 3 May 2024 11:43:33 +0800
Subject: [PATCH 10/27] code_style: rename
 BoolConverters.BoolToStarOrAutoGridLength to
 BoolConverters.ToStarOrAutoGridLength

---
 src/Converters/BoolConverters.cs | 2 +-
 src/Views/CommitBaseInfo.axaml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Converters/BoolConverters.cs b/src/Converters/BoolConverters.cs
index 02b9df8b..c860a1a6 100644
--- a/src/Converters/BoolConverters.cs
+++ b/src/Converters/BoolConverters.cs
@@ -12,7 +12,7 @@ namespace SourceGit.Converters
         public static readonly FuncValueConverter<bool, FontWeight> BoldIfTrue =
             new FuncValueConverter<bool, FontWeight>(x => x ? FontWeight.Bold : FontWeight.Regular);
 
-        public static readonly FuncValueConverter<bool, GridLength> BoolToStarOrAutoGridLength =
+        public static readonly FuncValueConverter<bool, GridLength> ToStarOrAutoGridLength =
             new(value => value ? new GridLength(1, GridUnitType.Star) : new GridLength(1, GridUnitType.Auto));
     }
 }
diff --git a/src/Views/CommitBaseInfo.axaml b/src/Views/CommitBaseInfo.axaml
index 37375319..87313098 100644
--- a/src/Views/CommitBaseInfo.axaml
+++ b/src/Views/CommitBaseInfo.axaml
@@ -14,7 +14,7 @@
         <!-- Author & Committer -->
         <Grid Margin="0,8">
           <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="{Binding IsCommitterVisible, Converter={x:Static c:BoolConverters.BoolToStarOrAutoGridLength}}"/>
+            <ColumnDefinition Width="{Binding IsCommitterVisible, Converter={x:Static c:BoolConverters.ToStarOrAutoGridLength}}"/>
             <ColumnDefinition Width="*"/>
           </Grid.ColumnDefinitions>
           <!-- Author -->

From 1fe050ed0bf4eb7ea6753e47eb7baca6d5d3f064 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 3 May 2024 20:47:22 +0800
Subject: [PATCH 11/27] enhance: if current repository is a worktree of another
 repository, watch the gitdir to it's main repository's gitdir (#86)

---
 src/Models/Watcher.cs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
index ceefc942..e6e30fb0 100644
--- a/src/Models/Watcher.cs
+++ b/src/Models/Watcher.cs
@@ -35,8 +35,15 @@ namespace SourceGit.Models
             _wcWatcher.Deleted += OnWorkingCopyChanged;
             _wcWatcher.EnableRaisingEvents = true;
 
+            // If this repository is a worktree repository, just watch the main repository's gitdir.
+            var gitDirNormalized = _repo.GitDir.Replace("\\", "/");
+            var worktreeIdx = gitDirNormalized.IndexOf(".git/worktrees/");
+            var repoWatchDir = _repo.GitDir;
+            if (worktreeIdx > 0)
+                repoWatchDir = _repo.GitDir.Substring(0, worktreeIdx + 4);
+
             _repoWatcher = new FileSystemWatcher();
-            _repoWatcher.Path = _repo.GitDir;
+            _repoWatcher.Path = repoWatchDir;
             _repoWatcher.Filter = "*";
             _repoWatcher.NotifyFilter = NotifyFilters.LastWrite | NotifyFilters.DirectoryName | NotifyFilters.FileName;
             _repoWatcher.IncludeSubdirectories = true;
@@ -173,8 +180,7 @@ namespace SourceGit.Models
             }
             else if (name.Equals("HEAD", StringComparison.Ordinal) ||
                 name.StartsWith("refs/heads/", StringComparison.Ordinal) ||
-                name.StartsWith("refs/remotes/", StringComparison.Ordinal) ||
-                name.StartsWith("worktrees/", StringComparison.Ordinal))
+                name.StartsWith("refs/remotes/", StringComparison.Ordinal))
             {
                 _updateBranch = DateTime.Now.AddSeconds(.5).ToFileTime();
             }

From 2e60c98eee723855d74dbef2a161dfbee3752e53 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Tue, 30 Apr 2024 21:22:48 +0800
Subject: [PATCH 12/27] fix: keep selected commit after _commits var reassigned

---
 src/ViewModels/Histories.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index 652ba805..fe02ce23 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -34,8 +34,19 @@ namespace SourceGit.ViewModels
             get => _commits;
             set
             {
+                var oldAutoSelectedCommitSHA = AutoSelectedCommit?.SHA;
                 if (SetProperty(ref _commits, value))
                 {
+                    Models.Commit newSelectedCommit = null;
+                    if (value.Count > 0 && oldAutoSelectedCommitSHA != null)
+                    {
+                        newSelectedCommit = value.Find(x => x.SHA == oldAutoSelectedCommitSHA);
+                    }
+                    if (newSelectedCommit != AutoSelectedCommit)
+                    {
+                        AutoSelectedCommit = newSelectedCommit;
+                    }
+
                     Graph = null;
                     Task.Run(() =>
                     {

From c9ce41aef32e57b68de59ff5e7a91e1bce5aa15c Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 3 May 2024 21:54:10 +0800
Subject: [PATCH 13/27] feature: supports open in/diff with VSCodium (#102)

---
 src/Models/ExternalMerger.cs               |   3 +++
 src/Models/ExternalTool.cs                 |   5 ++++
 src/Native/Linux.cs                        |   1 +
 src/Native/MacOS.cs                        |   1 +
 src/Native/Windows.cs                      |  28 +++++++++++++++++++++
 src/Resources/ExternalToolIcons/codium.png | Bin 0 -> 2867 bytes
 6 files changed, 38 insertions(+)
 create mode 100644 src/Resources/ExternalToolIcons/codium.png

diff --git a/src/Models/ExternalMerger.cs b/src/Models/ExternalMerger.cs
index 773a7f94..d61ce055 100644
--- a/src/Models/ExternalMerger.cs
+++ b/src/Models/ExternalMerger.cs
@@ -40,6 +40,7 @@ namespace SourceGit.Models
                     new ExternalMerger(5, "kdiff3", "KDiff3", "kdiff3.exe", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger(6, "beyond_compare", "Beyond Compare", "BComp.exe", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger(7, "win_merge", "WinMerge", "WinMergeU.exe", "-u -e \"$REMOTE\" \"$LOCAL\" \"$MERGED\"", "-u -e \"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMerger(8, "codium", "VSCodium", "VSCodium.exe", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
                 };
             }
             else if (OperatingSystem.IsMacOS())
@@ -51,6 +52,7 @@ namespace SourceGit.Models
                     new ExternalMerger(3, "vscode_insiders", "Visual Studio Code - Insiders", "/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger(4, "kdiff3", "KDiff3", "/Applications/kdiff3.app/Contents/MacOS/kdiff3", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger(5, "beyond_compare", "Beyond Compare", "/Applications/Beyond Compare.app/Contents/MacOS/bcomp", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMerger(6, "codium", "VSCodium", "/Applications/VSCodium.app/Contents/Resources/app/bin/codium", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
                 };
             }
             else if (OperatingSystem.IsLinux())
@@ -62,6 +64,7 @@ namespace SourceGit.Models
                     new ExternalMerger(3, "kdiff3", "KDiff3", "/usr/bin/kdiff3", "\"$REMOTE\" -b \"$BASE\" \"$LOCAL\" -o \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger(4, "beyond_compare", "Beyond Compare", "/usr/bin/bcomp", "\"$REMOTE\" \"$LOCAL\" \"$BASE\" \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
                     new ExternalMerger(5, "meld", "Meld", "/usr/bin/meld", "\"$LOCAL\" \"$BASE\" \"$REMOTE\" -output \"$MERGED\"", "\"$LOCAL\" \"$REMOTE\""),
+                    new ExternalMerger(6, "codium", "VSCodium", "/usr/share/codium/bin/codium", "-n --wait \"$MERGED\"", "-n --wait --diff \"$LOCAL\" \"$REMOTE\""),
                 };
             }
             else
diff --git a/src/Models/ExternalTool.cs b/src/Models/ExternalTool.cs
index c130fbcf..1489e1cf 100644
--- a/src/Models/ExternalTool.cs
+++ b/src/Models/ExternalTool.cs
@@ -126,6 +126,11 @@ namespace SourceGit.Models
             TryAdd("Visual Studio Code - Insiders", "vscode_insiders", "\"{0}\"", "VSCODE_INSIDERS_PATH", platformFinder);
         }
 
+        public void VSCodium(Func<string> platformFinder)
+        {
+            TryAdd("VSCodium", "codium", "\"{0}\"", "VSCODIUM_PATH", platformFinder);
+        }
+
         public void Fleet(Func<string> platformFinder)
         {
             TryAdd("Fleet", "fleet", "\"{0}\"", "FLEET_PATH", platformFinder);
diff --git a/src/Native/Linux.cs b/src/Native/Linux.cs
index 338f91d4..b34943a4 100644
--- a/src/Native/Linux.cs
+++ b/src/Native/Linux.cs
@@ -57,6 +57,7 @@ namespace SourceGit.Native
             var finder = new Models.ExternalToolsFinder();
             finder.VSCode(() => FindExecutable("code"));
             finder.VSCodeInsiders(() => FindExecutable("code-insiders"));
+            finder.VSCodium(() => FindExecutable("codium"));
             finder.Fleet(FindJetBrainsFleet);
             finder.FindJetBrainsFromToolbox(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}/JetBrains/Toolbox");
             finder.SublimeText(() => FindExecutable("subl"));
diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index 450b87ba..2e1de844 100644
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@@ -32,6 +32,7 @@ namespace SourceGit.Native
             var finder = new Models.ExternalToolsFinder();
             finder.VSCode(() => "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code");
             finder.VSCodeInsiders(() => "/Applications/Visual Studio Code - Insiders.app/Contents/Resources/app/bin/code");
+            finder.VSCodium(() => "/Applications/VSCodium.app/Contents/Resources/app/bin/codium");
             finder.Fleet(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}/Applications/Fleet.app/Contents/MacOS/Fleet");
             finder.FindJetBrainsFromToolbox(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)}/Library/Application Support/JetBrains/Toolbox");
             finder.SublimeText(() => "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl");
diff --git a/src/Native/Windows.cs b/src/Native/Windows.cs
index 8c4ab022..b0649189 100644
--- a/src/Native/Windows.cs
+++ b/src/Native/Windows.cs
@@ -110,6 +110,7 @@ namespace SourceGit.Native
             var finder = new Models.ExternalToolsFinder();
             finder.VSCode(FindVSCode);
             finder.VSCodeInsiders(FindVSCodeInsiders);
+            finder.VSCodium(FindVSCodium);
             finder.Fleet(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\Programs\\Fleet\\Fleet.exe");
             finder.FindJetBrainsFromToolbox(() => $"{Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData)}\\JetBrains\\Toolbox");
             finder.SublimeText(FindSublimeText);
@@ -323,6 +324,33 @@ namespace SourceGit.Native
             return string.Empty;
         }
 
+        private string FindVSCodium()
+        {
+            var localMachine = Microsoft.Win32.RegistryKey.OpenBaseKey(
+                    Microsoft.Win32.RegistryHive.LocalMachine,
+                    Microsoft.Win32.RegistryView.Registry64);
+
+            // VSCodium (system)
+            var systemVScodium = localMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{88DA3577-054F-4CA1-8122-7D820494CFFB}_is1");
+            if (systemVScodium != null)
+            {
+                return systemVScodium.GetValue("DisplayIcon") as string;
+            }
+
+            var currentUser = Microsoft.Win32.RegistryKey.OpenBaseKey(
+                    Microsoft.Win32.RegistryHive.CurrentUser,
+                    Microsoft.Win32.RegistryView.Registry64);
+
+            // VSCodium (user)
+            var vscodium = currentUser.OpenSubKey(@"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{2E1F05D1-C245-4562-81EE-28188DB6FD17}_is1");
+            if (vscodium != null)
+            {
+                return vscodium.GetValue("DisplayIcon") as string;
+            }
+
+            return string.Empty;
+        }
+
         private string FindSublimeText()
         {
             var localMachine = Microsoft.Win32.RegistryKey.OpenBaseKey(
diff --git a/src/Resources/ExternalToolIcons/codium.png b/src/Resources/ExternalToolIcons/codium.png
new file mode 100644
index 0000000000000000000000000000000000000000..10abb719f90f5bf2e3ab0c1ed26b8c1ebe097fb2
GIT binary patch
literal 2867
zcmV-33(WM1P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x3g}5hK~#9!<=c5s)YlyV@NLq=*feRQ&S;Y~CK?4%4iOLp<d7Q#v1rms
zrrK#!4-i?7Ecdc5_bDiCqHQN}rbbO;I_<R6fO0JhyX-FPvKK6Z5Oq3J8>5p{1>yDk
zc3Ift_kO!SSVi$S^TxmSxu5sm@4fH$eHRvMfuF>B-7C1Up0;Oa^-yqpjZU?*Mu+06
zp;ZlPV=4!CJQeta+ClgDTHU=FeDxrTtr~<u7#NSL)@@z<vtK*(XG?r+)c}gA96-?(
zT161I<-3b}0BUp^N_?dj4*-g)R3EjsudrjiZ-(&u-wom^N<(<^Q`>p+kG2=}r9{>1
ze()H-|GGXRzCwed$~3p5D^x2<pAX`WED7N&l0*3lMaVG)3dW5mM?tt1^`Y%t+<KJ(
zIg(Y6<p99Do@0uSF~yf_P$X`p>W`^D8_rk8g%<aJ8OrZRBzz#Z7X=pfq5!V!bBBKM
zy}!Ta_SVU<eS1z^jo$aCktK5;0Pc;YF;xR2M0}YVMU<&0!;94$jh{(6fBsp3*I~F_
z_(B;9D3DEgXN#828;-Gi8^_M>Z5%~=PL84^+)iA*p42$9eXf1Nl8>LoYc268yi|q4
zO4NTb;=_vj&zj;xsF%Gd9{EG_<x1DidjQ^Q96e)!M?c4{VdP$7!_{BRc@WAqe<$G$
z1E8FWC{}OYQKG1&#TQZI1M;OeJ>QdjZ(jJM(_g*>_y-htw7Y%;CDsp5?LK~mGnc-j
zDs*cAf1iLyVZ}<cqqu(%;8XVDduQ<e`BLOpAl*Oj*?;@Qs0$^&L61j?$A{6b<5$qG
zx}oB^^dDKSJxPN{_RoB;+06Ur%YNmcsBPrONhe0{)8nt81ZWW5{hDe2vHXFT0e{yT
zue1k00q~XpZf}-<fpk|OR~8tUCv|psAO*AkiEaE4ZsTz^x^SlbhnK2rnB!&bL5|qq
z>|O;8!-C!V_ud+xV8A0B-a@+>T`{tf(Oyt4e+BRpcmV92c`?lL64s-9@KFf(^9KAd
z39k=tA<#L;w12=~uoI8`d2*ixiQu?g^h`qia1||HAL0&7MOO|o`jR`2^#|F;<3OiR
zv*4j@eBIE8G<XD29*V8he#*38zz>?@gRSs*$Cv$K!3O~Evhg)T%_RJES~~%+!g414
zhTx2j7LSiRX))_@coHCp0sLJ`{B(#LU9NtYNuR+yg(p28M|r)Ok55)tJ=kbWYc28m
z@U~1-&$Lg#UnAjhkh3jclJWQqK#guY5pM`@o0#?q=yN1I4sW*=$auE;@Xiyxz9mak
z=#|y|!IsRfG#75m^A9VpUrvL^;jNTupMgd4R7!jS;PC+DN*ieL*`fq5PWK(J_q)-S
ztS;n<TV~g&M|$@LhYvt_rTm99cob2pQZilvJb3^SpC>_nd6J8y&w6EwR|5Q&1s-kA
z6r#-;LOBbLafc2-bd~xw)2l3VJWg)ZolN@-;rG2vgGau(65^@?cq##pJTf|wYet7-
z1E`p4?M}1X95ejvg~m*<Qzm&4fZoA;MLcYDd*MbWI*6;Xct6p10DqT&M}E0IV>AO$
zx+SZd67QbgiQF<eb~$zhRA|dd`0x^aa#Ic|Z46vxox(v5Tw+=TIdZ()-v}=1i!kjM
z@YkvEzPUYUYfjJC!~w_>m67o7=>p`M))7bf!Nl6Dt01{K10n9Ugu0=Towd5!o#ome
z*}l-wC}{9Fv6-CB>8<f5_juo!W_AGuQk@=;FEz~Z(8Le$Dxvy5o|(c@65fq1K%3G9
zQPy~<%K`pB`q;kC5Z=b)=&nYmj{D%oQsVM29el$E9$Ddy@qH2HCFbvpeZyI=G~)ft
z@yI7zj9j>??~?|Agm+_ipiOBV)}=SVUogYh8pB(Ch|4F=ewjKevfN>KxW$n*nGC=%
z3Gb6F8Yg`x4?F;rc>VH6ZfOD+>yWnY${hk8M|cwQRhC-hFuZ=llbkm84fvY`Jo4s<
zz9M}mz&BvL2L&ExAGsW&2#5ebPQc^%evEYd0e;GHc<KEBuGH0#Xi1g>ev*JkUL4UV
zX#m_agy*R6`T;oF{$J|Uwsz>YF|DPj*HP}c5aY8M;d!+9uVL4Jdv^It_t4-GgttQC
zE0EqPCg9P=qwTGv0k}@A)K+RIxfIb;WVuQ(NBlT60hFv7{R?^v0lz<pD>l16^UD>V
zBI0q7!|DE*`nCo=<IWa*OTeRzN80$LN^OrZr>Cmdg_dZ{N=s2Cx)p$bK#eDstl;Lh
z?;TIBWT~yAb!(1fgormpdAXFcpV8?{#HY5Q4au!h)GMGy_bCaFgB-}|!_4CU66G%$
z;AKJF-XMDeE3bU9iw!(J<0Gj)>z3YGMZ&wJw*7B?mVi30iLKU^P~#2BO+>jm-+Ta6
zr|l|S@cJ(L)(D?t5?T7@i0kO^5amsIrc11DnOxF@F9H4*0gqf#T0WsmX%k5J>Ez~L
z7Pq$=+f^I68rSd{;nRfA`DFKeg$ICuN1L;RGRoO!3r-O6M_OS3TH}cSaYU_p72v06
zDzy_(pj>6V3k)k(J+M`>VzTUw55V`+;`I?;SE1F>$L`!mhu@IWikws0B+kh#5~t)=
zmD8b1vh{~rD%Ym`<AvF<wo=<eTc$2mRT)xM^=o$2>lohw;LQ=1{Z)+jroek*JTy19
z(8Dxq1bi;QC#mtU@g2c<Xvr<e3Ae+S(Ryg>4qbwFdD!W2^RnrzZh&K>OnndkSOMOD
zA3N^uc}xeuJEw<l3lF>em@x_RV7G_5rVE7RnYV?%gx);Z46W&phK;Ry=vBav)0L^=
zU*!(Ia<|P&Ew?X`5&nIV8^G_;<Mjj3<IWbAc(6OAmb?8X3j79}_-3^BK=W*L7+Ik{
zLy0%9*WIMYL)nTev-`)6Ub*5|0e;O6ydk-vIOpxfueZjdH3ypR%x;EdDi^%r(cqCS
zJg(6PLMUqwek-SIHNce%g<pH139b2U^JnG-O4#h?gV)FQg|f3Ympw<61WW(cL&2wz
z@Ruy`O}ADb_~&Yil9%dvi1dbLqCC5bl~zAZneZ!+?Y2Y*WXo3g<cQyaqfTmj!?Vum
zt?})1#oxv=Z-t+U^kBCK{2eNMFbQv3xG>)2<Vh5e)qM`F1(KTqz)$JV`Rs>+p8&iT
z&iTJO!5I(e-#8^V1vwqO?78k>^Be1vzxe6T4tD$m%G>r`i-(r<#{&Mo?MkgRe)bZx
zXXZk~XF9$o<Gbd9A9PM_DRVyD8b*21G2bV&s6Pzw-^>@kl>+ZIcl@_5sqG&+A8p_K
zNNRujJA9t}Iy1b4F`nuk&y{V4p8$9R%=AjuqkaNPWGi5&KLz;ldEq(s<K4{g9sRD4
zYR2h*6d_&-1Caxp-W5{S#_{;}ix1`fp7*NY$~O4r%h=m;C0_vkuH*60QrkXzBK~j!
zXL8%}dZOVf>m=a+O^xqnhEHo(!Ebz*vYxajDe3&PJ~`cC5anF}{3K(%Vd+n8I@;>X
zdeR>+j@S#%dJRK7KI;C)S}YI#V+Dxtlnn5Y*S96I7SrRACD>v&KDBMq^S!1QS&Quf
ze4jg^UT1>G;q3@(F+NbTI!jZsGUAbQYHQEp900Z;-xhxQ`ud|qIRM^=MauxMv4K~(
zrnD^HKcdDVE&M=%19*iQKBaZc`AA#t+LZ1WSWnA?>vVA3Ij>7^S-#NU<^O31L>DSC
RS@8e>002ovPDHLkV1h2by9fXP

literal 0
HcmV?d00001


From 65fbeae07eacb6634cf72efca1595b5814f6d3b2 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 3 May 2024 22:02:19 +0800
Subject: [PATCH 14/27] readme: add VSCodium tips

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index e048bf78..8188c579 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,7 @@ This app supports open repository in external tools listed in the table below.
 | --- | --- | --- | --- | --- |
 | Visual Studio Code | YES | YES | YES | VSCODE_PATH |
 | Visual Studio Code - Insiders | YES | YES | YES | VSCODE_INSIDERS_PATH |
+| VSCodium | YES | YES | YES | VSCODIUM_PATH |
 | JetBrains Fleet | YES | YES | YES | FLEET_PATH |
 | Sublime Text | YES | YES | YES | SUBLIME_TEXT_PATH |
 

From 7da184c55b25db8122b4e104158bb2d057dbeb4d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 5 May 2024 13:01:04 +0800
Subject: [PATCH 15/27] fix: disable native system menubar on macOS (#106)

---
 src/Native/MacOS.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index 2e1de844..32cf87a1 100644
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@@ -19,6 +19,12 @@ namespace SourceGit.Native
             {
                 DefaultFamilyName = "PingFang SC",
             });
+
+            builder.With(new MacOSPlatformOptions()
+            {
+                DisableNativeMenus = true,
+                DisableDefaultApplicationMenuItems = true,
+            });
         }
 
         public string FindGitExecutable()

From 962720676431d686069e4ebdf781814f874ba4ee Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 5 May 2024 13:11:47 +0800
Subject: [PATCH 16/27] fix: launch terminal in current user's home dir failed
 on macOS(#105)

---
 src/Native/MacOS.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Native/MacOS.cs b/src/Native/MacOS.cs
index 32cf87a1..465dcdf9 100644
--- a/src/Native/MacOS.cs
+++ b/src/Native/MacOS.cs
@@ -65,10 +65,12 @@ namespace SourceGit.Native
         public void OpenTerminal(string workdir)
         {
             var dir = string.IsNullOrEmpty(workdir) ? "~" : workdir;
+            dir = dir.Replace(" ", "\\ ");
+
             var builder = new StringBuilder();
             builder.AppendLine("on run argv");
             builder.AppendLine("    tell application \"Terminal\"");
-            builder.AppendLine($"        do script \"cd '{dir}'\"");
+            builder.AppendLine($"        do script \"cd {dir}\"");
             builder.AppendLine("        activate");
             builder.AppendLine("    end tell");
             builder.AppendLine("end run");

From 68566b9b34d924a31a80294626e2eabb57971509 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 5 May 2024 18:19:59 +0800
Subject: [PATCH 17/27] =?UTF-8?q?enhance:=20use=20`=E2=8C=98`=20instead=20?=
 =?UTF-8?q?of=20`Ctrl`=20,=20`=E2=8C=A5`=20instead=20of=20`Alt`=20=20for?=
 =?UTF-8?q?=20all=20hotkeys=20used=20by=20this=20app=20on=20macOS=20(#103)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Views/Hotkeys.axaml     | 20 ++++++++++----------
 src/Views/Launcher.axaml    |  7 +++----
 src/Views/Launcher.axaml.cs | 12 ++++++++++--
 src/Views/Repository.axaml  |  2 +-
 src/Views/WorkingCopy.axaml |  4 ++--
 5 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 09fa93fb..9f85fc3b 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -68,13 +68,13 @@
                    Margin="0,0,0,8"/>
 
         <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="80,*">
-          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+T"/>
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+T, macOS=⌘+T}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.NewTab}" />
 
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Ctrl+W" />
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+W, macOS=⌘+W}" />
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CloseTab}" />
 
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="Ctrl+Tab"/>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+Tab, macOS=⌘+⌥+>}"/>
           <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoNextTab}" />
 
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="ESC"/>
@@ -88,19 +88,19 @@
                    Margin="0,8"/>
 
         <Grid RowDefinitions="20,20,20,20,20,20" ColumnDefinitions="80,*">
-          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+F"/>
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ToggleSearch}" />
 
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Ctrl+1"/>
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+1, macOS=⌘+1}"/>
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewHistories}" />
 
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="Ctrl+2"/>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+2, macOS=⌘+2}"/>
           <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewChanges}" />
 
-          <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="Ctrl+3"/>
+          <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+3, macOS=⌘+3}"/>
           <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewStashes}" />
 
-          <TextBlock Grid.Row="4" Grid.Column="0" Classes="monospace bold" Text="SPACE"/>
+          <TextBlock Grid.Row="4" Grid.Column="0" Classes="monospace bold" Text="Space"/>
           <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.StageOrUnstageSelected}" />
 
           <TextBlock Grid.Row="5" Grid.Column="0" Classes="monospace bold" Text="F5"/>
@@ -114,10 +114,10 @@
                    Margin="0,8"/>
 
         <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="80,*">
-          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="Ctrl+F"/>
+          <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.Search}" />
 
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="Shift+F3"/>
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Shift+F3, macOS=⇧+F3}"/>
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.GotoPrevMatch}" />
 
           <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="F3"/>
diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index 5b6003dd..f67f6ee0 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -203,7 +203,7 @@
                         <ToolTip.Tip>
                           <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                             <TextBlock Text="{DynamicResource Text.PageTabBar.Tab.Close}" VerticalAlignment="Center"/>
-                            <TextBlock Margin="16,0,0,0" Text="Ctrl+W" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                            <TextBlock Margin="16,0,0,0" Text="{OnPlatform Ctrl+W, macOS=⌘+W}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
                           </StackPanel>
                         </ToolTip.Tip>
                         <Path Width="8" Height="8" Data="{StaticResource Icons.Window.Close}"/>
@@ -226,12 +226,11 @@
             <Button Classes="icon_button"
                     Width="16" Height="16"
                     Margin="8,0"
-                    Command="{Binding AddNewTab}"
-                    HotKey="Ctrl+T">
+                    Command="{Binding AddNewTab}">
               <ToolTip.Tip>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                   <TextBlock Text="{DynamicResource Text.PageTabBar.New}" VerticalAlignment="Center"/>
-                  <TextBlock Margin="16,0,0,0" Text="Ctrl+T" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                  <TextBlock Margin="16,0,0,0" Text="{OnPlatform Ctrl+T, macOS=⌘+T}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
                 </StackPanel>
               </ToolTip.Tip>
               
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 2d3cf99c..c74d927a 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -98,7 +98,8 @@ namespace SourceGit.Views
         protected override void OnKeyDown(KeyEventArgs e)
         {
             var vm = DataContext as ViewModels.Launcher;
-            if (e.KeyModifiers.HasFlag(KeyModifiers.Control))
+            if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Meta)) ||
+                (!OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Control)))
             {
                 if (e.Key == Key.W)
                 {
@@ -106,7 +107,14 @@ namespace SourceGit.Views
                     e.Handled = true;
                     return;
                 }
-                else if (e.Key == Key.Tab)
+                else if (e.Key == Key.T)
+                {
+                    vm.AddNewTab();
+                    e.Handled = true;
+                    return;
+                }
+                else if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) || 
+                    (!OperatingSystem.IsMacOS() && e.Key == Key.Tab))
                 {
                     vm.GotoNextTab();
                     e.Handled = true;
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 8a0ec5ce..1423807d 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -32,7 +32,7 @@
             <ToolTip.Tip>
               <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <TextBlock Text="{DynamicResource Text.Repository.Search}" VerticalAlignment="Center"/>
-                <TextBlock Margin="16,0,0,0" Text="Ctrl+F" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="{OnPlatform Ctrl+F, macOS=⌘+F}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
               </StackPanel>
             </ToolTip.Tip>
             <Path Width="14" Height="14" Data="{StaticResource Icons.Search}"/>
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 0dded0ad..637232e2 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -47,7 +47,7 @@
             <ToolTip.Tip>
               <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <TextBlock Text="{DynamicResource Text.WorkingCopy.Unstaged.Stage}" VerticalAlignment="Center"/>
-                <TextBlock Margin="16,0,0,0" Text="SPACE" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="Space" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
               </StackPanel>
             </ToolTip.Tip>
             <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
@@ -183,7 +183,7 @@
             <ToolTip.Tip>
               <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <TextBlock Text="{DynamicResource Text.WorkingCopy.Staged.Unstage}" VerticalAlignment="Center"/>
-                <TextBlock Margin="16,0,0,0" Text="SPACE" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="Space" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
               </StackPanel>
             </ToolTip.Tip>
             <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>

From 5964cf2587be8ae4537fe077442fd2fe59035f20 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 5 May 2024 18:31:11 +0800
Subject: [PATCH 18/27] ux: macOS hotkey (#103)

---
 src/Views/Hotkeys.axaml     | 4 ++--
 src/Views/WorkingCopy.axaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index 9f85fc3b..a2d0e068 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -74,7 +74,7 @@
           <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+W, macOS=⌘+W}" />
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CloseTab}" />
 
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+Tab, macOS=⌘+⌥+>}"/>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+Tab, macOS=⌘+⌥+→}"/>
           <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoNextTab}" />
 
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="ESC"/>
@@ -100,7 +100,7 @@
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+3, macOS=⌘+3}"/>
           <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewStashes}" />
 
-          <TextBlock Grid.Row="4" Grid.Column="0" Classes="monospace bold" Text="Space"/>
+          <TextBlock Grid.Row="4" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Space, macOS=␣}"/>
           <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.StageOrUnstageSelected}" />
 
           <TextBlock Grid.Row="5" Grid.Column="0" Classes="monospace bold" Text="F5"/>
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index 637232e2..bd65724a 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -47,7 +47,7 @@
             <ToolTip.Tip>
               <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <TextBlock Text="{DynamicResource Text.WorkingCopy.Unstaged.Stage}" VerticalAlignment="Center"/>
-                <TextBlock Margin="16,0,0,0" Text="Space" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="{OnPlatform Space, macOS=␣}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
               </StackPanel>
             </ToolTip.Tip>
             <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Down}"/>
@@ -183,7 +183,7 @@
             <ToolTip.Tip>
               <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                 <TextBlock Text="{DynamicResource Text.WorkingCopy.Staged.Unstage}" VerticalAlignment="Center"/>
-                <TextBlock Margin="16,0,0,0" Text="Space" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
+                <TextBlock Margin="16,0,0,0" Text="{OnPlatform Space, macOS=␣}" Opacity=".6" FontSize="11" VerticalAlignment="Center"/>
               </StackPanel>
             </ToolTip.Tip>
             <Path Width="14" Height="14" Margin="0,6,0,0" Data="{StaticResource Icons.Up}"/>

From eced2e09bd879b7f7ef72111c4b53b0b7bd3cb81 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 5 May 2024 18:47:02 +0800
Subject: [PATCH 19/27] ux: show tips if user is about to delete a remote
 branch (#99)

---
 src/Resources/Locales/en_US.axaml |  1 +
 src/Resources/Locales/zh_CN.axaml |  1 +
 src/Views/DeleteBranch.axaml      | 21 ++++++++++++++++-----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 0f3fac65..89cf0ddd 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -120,6 +120,7 @@
   <x:String x:Key="Text.Cut" xml:space="preserve">Cut</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Delete Branch</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch :</x:String>
+  <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">You are about to delete a remote branch!!!</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">Delete 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">Target :</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index a5c487b3..9cbd77d4 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -120,6 +120,7 @@
   <x:String x:Key="Text.Cut" xml:space="preserve">剪切</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">删除分支确认</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名 ：</x:String>
+  <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在删除远程上的分支，请务必小心！！！</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">删除远程确认</x:String>
   <x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">远程名 ：</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">目标 ：</x:String>
diff --git a/src/Views/DeleteBranch.axaml b/src/Views/DeleteBranch.axaml
index 7280a636..0427c271 100644
--- a/src/Views/DeleteBranch.axaml
+++ b/src/Views/DeleteBranch.axaml
@@ -11,10 +11,21 @@
     <TextBlock FontSize="18"
                Classes="bold"
                Text="{DynamicResource Text.DeleteBranch}"/>
-    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,16,0,0">
-      <TextBlock Text="{DynamicResource Text.DeleteBranch.Branch}"/>
-      <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
-      <TextBlock Text="{Binding Target, Converter={x:Static c:BranchConverters.ToName}}"/>
-    </StackPanel>
+    
+    <Grid Margin="0,16,8,0" RowDefinitions="32,Auto" ColumnDefinitions="150,*">
+      <TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" Text="{DynamicResource Text.DeleteBranch.Branch}"/>
+      <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
+        <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
+        <TextBlock Text="{Binding Target, Converter={x:Static c:BranchConverters.ToName}}"/>
+      </StackPanel>
+
+      <Border Grid.Row="1" Grid.Column="1" Height="32" IsVisible="{Binding !Target.IsLocal}">
+        <TextBlock Margin="8,0"
+                   Text="{DynamicResource Text.DeleteBranch.IsRemoteTip}"
+                   Foreground="{DynamicResource Brush.FG2}"
+                   FontStyle="Italic"
+                   VerticalAlignment="Center"/>
+      </Border>
+    </Grid>
   </StackPanel>
 </UserControl>

From d46979a0c5ef52ead5c27c4c1d83bdc047ac6b1e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sun, 5 May 2024 19:45:28 +0800
Subject: [PATCH 20/27] feature: add a checkbox to also delete the tracking
 remote branch (#99)

---
 src/Resources/Locales/en_US.axaml     |  1 +
 src/Resources/Locales/zh_CN.axaml     |  1 +
 src/ViewModels/DeleteBranch.cs        | 30 +++++++++++++++++++++++++++
 src/ViewModels/Histories.cs           |  1 -
 src/Views/DeleteBranch.axaml          | 10 +++++++--
 src/Views/Launcher.axaml.cs           |  2 +-
 src/Views/NameHighlightedTextBlock.cs |  2 +-
 7 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 89cf0ddd..74a92064 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -121,6 +121,7 @@
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Delete Branch</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch :</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">You are about to delete a remote branch!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Also delete remote branch${0}$</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">Delete 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">Target :</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 9cbd77d4..8a9bd825 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -121,6 +121,7 @@
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">删除分支确认</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名 ：</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在删除远程上的分支，请务必小心！！！</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">同时删除远程分支${0}$</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">删除远程确认</x:String>
   <x:String x:Key="Text.DeleteRemote.Remote" xml:space="preserve">远程名 ：</x:String>
   <x:String x:Key="Text.DeleteRepositoryNode.Target" xml:space="preserve">目标 ：</x:String>
diff --git a/src/ViewModels/DeleteBranch.cs b/src/ViewModels/DeleteBranch.cs
index 5192383f..b5151e97 100644
--- a/src/ViewModels/DeleteBranch.cs
+++ b/src/ViewModels/DeleteBranch.cs
@@ -10,10 +10,36 @@ namespace SourceGit.ViewModels
             private set;
         }
 
+        public Models.Branch TrackingRemoteBranch
+        {
+            get;
+            private set;
+        }
+
+        public object DeleteTrackingRemoteTip
+        {
+            get;
+            private set;
+        }
+
+        public bool AlsoDeleteTrackingRemote
+        {
+            get => _alsoDeleteTrackingRemote;
+            set => SetProperty(ref _alsoDeleteTrackingRemote, value);
+        }
+
         public DeleteBranch(Repository repo, Models.Branch branch)
         {
             _repo = repo;
             Target = branch;
+
+            if (branch.IsLocal && !string.IsNullOrEmpty(branch.Upstream))
+            {
+                var upstream = branch.Upstream.Substring(13);
+                TrackingRemoteBranch = repo.Branches.Find(x => !x.IsLocal && $"{x.Remote}/{x.Name}" == upstream);
+                DeleteTrackingRemoteTip = new Views.NameHighlightedTextBlock("DeleteBranch.WithTrackingRemote", upstream);
+            }
+
             View = new Views.DeleteBranch() { DataContext = this };
         }
 
@@ -27,6 +53,9 @@ namespace SourceGit.ViewModels
                 if (Target.IsLocal)
                 {
                     Commands.Branch.Delete(_repo.FullPath, Target.Name);
+
+                    if (_alsoDeleteTrackingRemote && TrackingRemoteBranch != null)
+                        new Commands.Push(_repo.FullPath, TrackingRemoteBranch.Remote, TrackingRemoteBranch.Name).Exec();
                 }
                 else
                 {
@@ -39,5 +68,6 @@ namespace SourceGit.ViewModels
         }
 
         private readonly Repository _repo = null;
+        private bool _alsoDeleteTrackingRemote = false;
     }
 }
diff --git a/src/ViewModels/Histories.cs b/src/ViewModels/Histories.cs
index fe02ce23..a9f62516 100644
--- a/src/ViewModels/Histories.cs
+++ b/src/ViewModels/Histories.cs
@@ -383,7 +383,6 @@ namespace SourceGit.ViewModels
                 fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream);
                 fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
                 fastForward.IsEnabled = !string.IsNullOrEmpty(current.UpstreamTrackStatus) && current.UpstreamTrackStatus.IndexOf('↑') < 0;
-                ;
                 fastForward.Click += (o, e) =>
                 {
                     if (PopupHost.CanCreatePopup())
diff --git a/src/Views/DeleteBranch.axaml b/src/Views/DeleteBranch.axaml
index 0427c271..8245c091 100644
--- a/src/Views/DeleteBranch.axaml
+++ b/src/Views/DeleteBranch.axaml
@@ -2,7 +2,9 @@
              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:m="using:SourceGit.Models"
              xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
              xmlns:c="using:SourceGit.Converters"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="SourceGit.Views.DeleteBranch"
@@ -12,7 +14,7 @@
                Classes="bold"
                Text="{DynamicResource Text.DeleteBranch}"/>
     
-    <Grid Margin="0,16,8,0" RowDefinitions="32,Auto" ColumnDefinitions="150,*">
+    <Grid Margin="0,16,8,0" RowDefinitions="32,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" Text="{DynamicResource Text.DeleteBranch.Branch}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
@@ -20,12 +22,16 @@
       </StackPanel>
 
       <Border Grid.Row="1" Grid.Column="1" Height="32" IsVisible="{Binding !Target.IsLocal}">
-        <TextBlock Margin="8,0"
+        <TextBlock Margin="6,0,0,0"
                    Text="{DynamicResource Text.DeleteBranch.IsRemoteTip}"
                    Foreground="{DynamicResource Brush.FG2}"
                    FontStyle="Italic"
                    VerticalAlignment="Center"/>
       </Border>
+
+      <Border Grid.Row="1" Grid.Column="1" Height="32" IsVisible="{Binding TrackingRemoteBranch, Converter={x:Static ObjectConverters.IsNotNull}}">
+        <CheckBox Margin="6,0,0,0" Content="{Binding DeleteTrackingRemoteTip}" IsChecked="{Binding AlsoDeleteTrackingRemote, Mode=TwoWay}"/>
+      </Border>
     </Grid>
   </StackPanel>
 </UserControl>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index c74d927a..c56de06b 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -113,7 +113,7 @@ namespace SourceGit.Views
                     e.Handled = true;
                     return;
                 }
-                else if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) || 
+                else if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) ||
                     (!OperatingSystem.IsMacOS() && e.Key == Key.Tab))
                 {
                     vm.GotoNextTab();
diff --git a/src/Views/NameHighlightedTextBlock.cs b/src/Views/NameHighlightedTextBlock.cs
index 26ab9646..3be81186 100644
--- a/src/Views/NameHighlightedTextBlock.cs
+++ b/src/Views/NameHighlightedTextBlock.cs
@@ -71,7 +71,7 @@ namespace SourceGit.Views
                     FontSize,
                     Foreground);
 
-            return new Size(formatted.Width - 16, formatted.Height);
+            return new Size(formatted.Width, formatted.Height);
         }
 
         public override void Render(DrawingContext context)

From d87716dc8675ea15218fa401b3f48ed628337bd2 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 6 May 2024 07:08:29 +0800
Subject: [PATCH 21/27] fix: disable removing repository at startup (#90)

---
 src/ViewModels/Preference.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ViewModels/Preference.cs b/src/ViewModels/Preference.cs
index 8d0520c8..cf488328 100644
--- a/src/ViewModels/Preference.cs
+++ b/src/ViewModels/Preference.cs
@@ -37,7 +37,8 @@ namespace SourceGit.ViewModels
                     }
                 }
 
-                _instance.Repositories.RemoveAll(x => !Directory.Exists(x.FullPath));
+                // It will cause some issue on Linux. See https://github.com/sourcegit-scm/sourcegit/issues/99
+                // _instance.Repositories.RemoveAll(x => !Directory.Exists(x.FullPath));
 
                 if (_instance.DefaultFont == null)
                 {

From c7784b05cdd33ca0d8e09964b8c0e77c80805094 Mon Sep 17 00:00:00 2001
From: dani <dangreene0@gmail.com>
Date: Sun, 5 May 2024 23:13:45 +0000
Subject: [PATCH 22/27] Added ability to run program by default.

---
 .github/workflows/ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 983a837c..6a911e7e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,6 +44,8 @@ jobs:
         run: dotnet build -c Release
       - name: Publish
         run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+      - name: Allow Executing File as Program
+        run: chmod +x publish/Sourcegit
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -65,6 +67,8 @@ jobs:
         run: dotnet build -c Release
       - name: Publish
         run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-arm64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+      - name: Allow Executing File as Program
+        run: chmod +x publish/Sourcegit
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -88,6 +92,8 @@ jobs:
         run: dotnet publish src/SourceGit.csproj -c Release -o publish -r linux-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
       - name: Rename Executable File
         run: mv publish/SourceGit publish/sourcegit
+      - name: Allow Executing File as Program
+        run: chmod +x publish/sourcegit
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:

From e0d3a320fc8d283e2da60f843a7a6cb53902e95d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 6 May 2024 07:14:53 +0800
Subject: [PATCH 23/27] ux: macOS hotkey tips (#103)

---
 src/Views/Launcher.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/Launcher.axaml b/src/Views/Launcher.axaml
index f67f6ee0..861fec09 100644
--- a/src/Views/Launcher.axaml
+++ b/src/Views/Launcher.axaml
@@ -121,7 +121,7 @@
                         <MenuItem Header="{DynamicResource Text.PageTabBar.Tab.Close}"
                                   Command="{Binding #me.DataContext.(vm:Launcher).CloseTab}"
                                   CommandParameter="{Binding}"
-                                  InputGesture="Ctrl+W"/>
+                                  InputGesture="{OnPlatform Ctrl+W, macOS=⌘+W}"/>
                         <MenuItem Header="{DynamicResource Text.PageTabBar.Tab.CloseOther}"
                                   Command="{Binding #me.DataContext.(vm:Launcher).CloseOtherTabs}"
                                   CommandParameter="{Binding}"/>

From b651835de00257c8be53a3f0c4f6a55ac835e6f5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 6 May 2024 10:22:13 +0800
Subject: [PATCH 24/27] enhance: hotkeys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add `Shift+Ctrl+Tab` (`⌘+⌥+←` on macOS) to go to previous page
* use `ESC` to cancel commit searching
* enable `AutoFocusBehaviour` on `CommitChanges` and `RevisionFiles` tab
---
 src/Resources/Locales/en_US.axaml |  3 ++-
 src/Resources/Locales/zh_CN.axaml |  3 ++-
 src/ViewModels/Launcher.cs        | 10 ++++++++++
 src/Views/CommitChanges.axaml     |  3 ++-
 src/Views/Hotkeys.axaml           | 23 +++++++++++++----------
 src/Views/Launcher.axaml.cs       | 17 +++++++++++++++--
 src/Views/RevisionFiles.axaml     |  3 ++-
 7 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 74a92064..563809eb 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -213,12 +213,13 @@
   <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">GLOBAL</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">Cancel current popup</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CloseTab" xml:space="preserve">Close current page</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Go to previous page</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Go to next page</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Create new page</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">REPOSITORY</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Force to reload this repository</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Stage/Unstage selected changes</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.ToggleSearch" xml:space="preserve">Toggle commit search</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Open commit search</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">Switch to 'Changes'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">Switch to 'Histories'</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewStashes" xml:space="preserve">Switch to 'Stashes'</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 8a9bd825..76385fe0 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -213,12 +213,13 @@
   <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">全局快捷键</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CancelPopup" xml:space="preserve">取消弹出面板</x:String>
   <x:String x:Key="Text.Hotkeys.Global.CloseTab" xml:space="preserve">关闭当前页面</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">切换到上一个页面</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">切换到下一个页面</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">新建页面</x:String>
   <x:String x:Key="Text.Hotkeys.Repo" xml:space="preserve">仓库页面快捷键</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">重新加载仓库状态</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">将选中的变更暂存或从暂存列表中移除</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.ToggleSearch" xml:space="preserve">打开/关闭历史搜索</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">打开历史搜索</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">显示本地更改</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">显示历史记录</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewStashes" xml:space="preserve">显示贮藏列表</x:String>
diff --git a/src/ViewModels/Launcher.cs b/src/ViewModels/Launcher.cs
index 59cf309a..3d1fc1c1 100644
--- a/src/ViewModels/Launcher.cs
+++ b/src/ViewModels/Launcher.cs
@@ -93,6 +93,16 @@ namespace SourceGit.ViewModels
             ActivePage = Pages[nextIdx];
         }
 
+        public void GotoPrevTab()
+        {
+            if (Pages.Count == 1)
+                return;
+
+            var activeIdx = Pages.IndexOf(_activePage);
+            var prevIdx = activeIdx == 0 ? Pages.Count - 1 : activeIdx - 1;
+            ActivePage = Pages[prevIdx];
+        }
+
         public void CloseTab(object param)
         {
             if (Pages.Count == 1)
diff --git a/src/Views/CommitChanges.axaml b/src/Views/CommitChanges.axaml
index 3720590b..7f1ccc32 100644
--- a/src/Views/CommitChanges.axaml
+++ b/src/Views/CommitChanges.axaml
@@ -23,7 +23,8 @@
                  BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" 
                  Background="Transparent"
                  Watermark="{DynamicResource Text.CommitDetail.Changes.Search}"
-                 Text="{Binding SearchChangeFilter, Mode=TwoWay}">
+                 Text="{Binding SearchChangeFilter, Mode=TwoWay}"
+                 v:AutoFocusBehaviour.IsEnabled="True">
           <TextBox.InnerLeftContent>
             <Path Width="14" Height="14" Margin="4,0,0,0" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Search}"/>
           </TextBox.InnerLeftContent>
diff --git a/src/Views/Hotkeys.axaml b/src/Views/Hotkeys.axaml
index a2d0e068..96f0a9a2 100644
--- a/src/Views/Hotkeys.axaml
+++ b/src/Views/Hotkeys.axaml
@@ -67,18 +67,21 @@
                    FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Increase}}"
                    Margin="0,0,0,8"/>
 
-        <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="80,*">
+        <Grid RowDefinitions="20,20,20,20,20" ColumnDefinitions="150,*">
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+T, macOS=⌘+T}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.NewTab}" />
 
           <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+W, macOS=⌘+W}" />
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CloseTab}" />
 
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+Tab, macOS=⌘+⌥+→}"/>
-          <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoNextTab}" />
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Shift+Ctrl+Tab, macOS=⌘+⌥+←}"/>
+          <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoPrevTab}" />
 
-          <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="ESC"/>
-          <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CancelPopup}" />
+          <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+Tab, macOS=⌘+⌥+→}"/>
+          <TextBlock Grid.Row="3" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.GotoNextTab}" />
+
+          <TextBlock Grid.Row="4" Grid.Column="0" Classes="monospace bold" Text="ESC"/>
+          <TextBlock Grid.Row="4" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Global.CancelPopup}" />
         </Grid>
 
         <TextBlock Text="{DynamicResource Text.Hotkeys.Repo}"
@@ -87,9 +90,9 @@
                    FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Increase}}"
                    Margin="0,8"/>
 
-        <Grid RowDefinitions="20,20,20,20,20,20" ColumnDefinitions="80,*">
+        <Grid RowDefinitions="20,20,20,20,20,20" ColumnDefinitions="150,*">
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
-          <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ToggleSearch}" />
+          <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.OpenSearchCommits}" />
 
           <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+1, macOS=⌘+1}"/>
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.Repo.ViewHistories}" />
@@ -113,14 +116,14 @@
                    FontSize="{Binding Source={x:Static vm:Preference.Instance}, Path=DefaultFontSize, Converter={x:Static c:FontSizeModifyConverters.Increase}}"
                    Margin="0,8"/>
 
-        <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="80,*">
+        <Grid RowDefinitions="20,20,20,20" ColumnDefinitions="150,*">
           <TextBlock Grid.Row="0" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Ctrl+F, macOS=⌘+F}"/>
           <TextBlock Grid.Row="0" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.Search}" />
 
-          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Shift+F3, macOS=⇧+F3}"/>
+          <TextBlock Grid.Row="1" Grid.Column="0" Classes="monospace bold" Text="{OnPlatform Shift+F3/Shift+Enter, macOS=⇧+F3/⇧+Enter}"/>
           <TextBlock Grid.Row="1" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.GotoPrevMatch}" />
 
-          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="F3"/>
+          <TextBlock Grid.Row="2" Grid.Column="0" Classes="monospace bold" Text="F3/Enter"/>
           <TextBlock Grid.Row="2" Grid.Column="1" Margin="16,0,0,0" Text="{DynamicResource Text.Hotkeys.TextEditor.GotoNextMatch}" />
 
           <TextBlock Grid.Row="3" Grid.Column="0" Classes="monospace bold" Text="ESC"/>
diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index c56de06b..d6f4b54f 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -114,12 +114,19 @@ namespace SourceGit.Views
                     return;
                 }
                 else if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Right) ||
-                    (!OperatingSystem.IsMacOS() && e.Key == Key.Tab))
+                    (!OperatingSystem.IsMacOS() && !e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
                 {
                     vm.GotoNextTab();
                     e.Handled = true;
                     return;
                 }
+                else if ((OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Alt) && e.Key == Key.Left) ||
+                    (!OperatingSystem.IsMacOS() && e.KeyModifiers.HasFlag(KeyModifiers.Shift) && e.Key == Key.Tab))
+                {
+                    vm.GotoPrevTab();
+                    e.Handled = true;
+                    return;
+                }
                 else if (vm.ActivePage.Data is ViewModels.Repository repo)
                 {
                     if (e.Key == Key.D1 || e.Key == Key.NumPad1)
@@ -142,7 +149,7 @@ namespace SourceGit.Views
                     }
                     else if (e.Key == Key.F)
                     {
-                        repo.IsSearching = !repo.IsSearching;
+                        repo.IsSearching = true;
                         e.Handled = true;
                         return;
                     }
@@ -151,6 +158,12 @@ namespace SourceGit.Views
             else if (e.Key == Key.Escape)
             {
                 vm.ActivePage.CancelPopup();
+
+                if (vm.ActivePage.Data is ViewModels.Repository repo)
+                {
+                    repo.IsSearching = false;
+                }
+
                 e.Handled = true;
                 return;
             }
diff --git a/src/Views/RevisionFiles.axaml b/src/Views/RevisionFiles.axaml
index 2804f627..e91c6e0b 100644
--- a/src/Views/RevisionFiles.axaml
+++ b/src/Views/RevisionFiles.axaml
@@ -24,7 +24,8 @@
                BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
                Background="Transparent"
                Watermark="{DynamicResource Text.CommitDetail.Changes.Search}"
-               Text="{Binding SearchFileFilter, Mode=TwoWay}">
+               Text="{Binding SearchFileFilter, Mode=TwoWay}"
+               v:AutoFocusBehaviour.IsEnabled="True">
         <TextBox.InnerLeftContent>
           <Path Width="14" Height="14" Margin="4,0,0,0" Fill="{DynamicResource Brush.FG2}" Data="{StaticResource Icons.Search}"/>
         </TextBox.InnerLeftContent>

From 96a1c972deb85cdc19090a0f913aad45da1a83c8 Mon Sep 17 00:00:00 2001
From: dani <dangreene0@gmail.com>
Date: Mon, 6 May 2024 03:18:20 +0000
Subject: [PATCH 25/27] Program packaged into tarball before uploaded to
 artifacts

---
 .github/workflows/ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a911e7e..0988685c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - develop
+      - executable
   pull_request:
-    branches: [develop]
+    branches: [executable]
   workflow_dispatch:
 jobs:
   build-windows:
@@ -44,13 +44,13 @@ jobs:
         run: dotnet build -c Release
       - name: Publish
         run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
-      - name: Allow Executing File as Program
-        run: chmod +x publish/Sourcegit
+      - name: Packing Program
+        run:  tar -cvf sourcegit.osx-x64.tar publish/
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: sourcegit.osx-x64
-          path: publish
+          path: sourcegit.osx-x64.tar
   build-macos-arm64:
     name: Build macOS (Apple Silicon)
     runs-on: macos-latest
@@ -67,13 +67,13 @@ jobs:
         run: dotnet build -c Release
       - name: Publish
         run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-arm64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
-      - name: Allow Executing File as Program
-        run: chmod +x publish/Sourcegit
+      - name: Packing Program
+        run: tar -cvf sourcegit.osx-arm64.tar publish/
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: sourcegit.osx-arm64
-          path: publish
+          path: sourcegit.osx-arm64.tar
   build-linux:
     name: Build Linux
     runs-on: ubuntu-latest
@@ -92,10 +92,10 @@ jobs:
         run: dotnet publish src/SourceGit.csproj -c Release -o publish -r linux-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
       - name: Rename Executable File
         run: mv publish/SourceGit publish/sourcegit
-      - name: Allow Executing File as Program
-        run: chmod +x publish/sourcegit
+      - name: Packing Program
+        run: tar -cvf sourcegit.linux-x64.tar publish/
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
           name: sourcegit.linux-x64
-          path: publish
+          path: sourcegit.linux-x64.tar

From 9ccd386c8087cf79c671d73b3cd3aa32a08f871a Mon Sep 17 00:00:00 2001
From: dani <dangreene0@gmail.com>
Date: Mon, 6 May 2024 03:20:32 +0000
Subject: [PATCH 26/27] Switched workflow branch back to develop

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0988685c..6e856ec0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,9 +2,9 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - executable
+      - develop
   pull_request:
-    branches: [executable]
+    branches: [develop]
   workflow_dispatch:
 jobs:
   build-windows:

From 04185a7f9cc889a4ff7b74cd165ccc271dd0bad1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 6 May 2024 12:08:19 +0800
Subject: [PATCH 27/27] version: Release 8.11

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

diff --git a/VERSION b/VERSION
index 8d04a0f3..3578724f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.10
\ No newline at end of file
+8.11
\ No newline at end of file