Merge branch 'release/8.27'

Author: love-linger

.github/workflows/build.yml

@@ -0,0 +1,68 @@
+name: Build
+on:
+  workflow_call:
+jobs:
+  build:
+    strategy:
+      matrix:
+        include:
+          - name : Windows x64
+            os: windows-2019
+            runtime: win-x64
+          - name : Windows ARM64
+            os: windows-2019
+            runtime: win-arm64
+          - name : macOS (Intel)
+            os: macos-13
+            runtime: osx-x64
+          - name : macOS (Apple Silicon)
+            os: macos-latest
+            runtime: osx-arm64
+          - name : Linux
+            os: ubuntu-20.04
+            runtime: linux-x64
+          - name : Linux (arm64)
+            os: ubuntu-20.04
+            runtime: linux-arm64
+    name: Build ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Configure arm64 packages
+        if: ${{ matrix.runtime == 'linux-arm64' }}
+        run: |
+          sudo dpkg --add-architecture arm64
+          echo 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted
+          deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted
+          deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted' \
+          | sudo tee /etc/apt/sources.list.d/arm64.list
+          sudo sed -i -e 's/^deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
+          sudo sed -i -e 's/^deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
+      - name: Install cross-compiling dependencies
+        if: ${{ matrix.runtime == 'linux-arm64' }}
+        run: |
+          sudo apt-get update
+          sudo apt-get install clang llvm gcc-aarch64-linux-gnu zlib1g-dev:arm64
+      - name: Build
+        run: dotnet build -c Release
+      - name: Publish
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r ${{ matrix.runtime }}
+      - name: Rename executable file
+        if: ${{ startsWith(matrix.runtime, 'linux-') }}
+        run: mv publish/SourceGit publish/sourcegit
+      - name: Tar artifact
+        if: ${{ startsWith(matrix.runtime, 'linux-') || startsWith(matrix.runtime, 'osx-') }}
+        run: |
+          tar -cvf "sourcegit.${{ matrix.runtime }}.tar" -C publish .
+          rm -r publish/*
+          mv "sourcegit.${{ matrix.runtime }}.tar" publish
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: sourcegit.${{ matrix.runtime }}
+          path: publish/*

.github/workflows/ci.yml

@@ -8,66 +8,22 @@ on:
   workflow_call:
 jobs:
   build:
-    strategy:
-      matrix:
-        include:
-          - name : Windows x64
-            os: windows-2019
-            runtime: win-x64
-          - name : Windows ARM64
-            os: windows-2019
-            runtime: win-arm64
-          - name : macOS (Intel)
-            os: macos-13
-            runtime: osx-x64
-          - name : macOS (Apple Silicon)
-            os: macos-latest
-            runtime: osx-arm64
-          - name : Linux
-            os: ubuntu-20.04
-            runtime: linux-x64
-          - name : Linux (arm64)
-            os: ubuntu-20.04
-            runtime: linux-arm64
-    name: Build ${{ matrix.name }}
-    runs-on: ${{ matrix.os }}
+    name: Build
+    uses: ./.github/workflows/build.yml
+  version:
+    name: Prepare version string
+    runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.version }}
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 8.0.x
-      - name: Configure arm64 packages
-        if: ${{ matrix.runtime == 'linux-arm64' }}
-        run: |
-          sudo dpkg --add-architecture arm64
-          echo 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted
-          deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted
-          deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted' \
-          | sudo tee /etc/apt/sources.list.d/arm64.list
-          sudo sed -i -e 's/^deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
-          sudo sed -i -e 's/^deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
-      - name: Install cross-compiling dependencies
-        if: ${{ matrix.runtime == 'linux-arm64' }}
-        run: |
-          sudo apt-get update
-          sudo apt-get install clang llvm gcc-aarch64-linux-gnu zlib1g-dev:arm64
-      - name: Build
-        run: dotnet build -c Release
-      - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r ${{ matrix.runtime }}
-      - name: Rename executable file
-        if: ${{ startsWith(matrix.runtime, 'linux-') }}
-        run: mv publish/SourceGit publish/sourcegit
-      - name: Tar artifact
-        if: ${{ startsWith(matrix.runtime, 'linux-') }}
-        run: |
-          tar -cvf "sourcegit.${{ matrix.runtime }}.tar" -C publish .
-          rm -r publish/*
-          mv "sourcegit.${{ matrix.runtime }}.tar" publish
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: sourcegit.${{ matrix.runtime }}
-          path: publish
+      - name: Output version string
+        id: version
+        run: echo "version=$(cat VERSION)" >> "$GITHUB_OUTPUT"
+  package:
+    needs: [build, version]
+    name: Package
+    uses: ./.github/workflows/package.yml
+    with:
+      version: ${{ needs.version.outputs.version }}

.github/workflows/package.yml

@@ -7,12 +7,8 @@ on:
         required: true
         type: string
 jobs:
-  build:
-    name: Build
-    uses: ./.github/workflows/ci.yml
   windows-portable:
     name: Package portable Windows app
-    needs: build
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -35,10 +31,13 @@ jobs:
         with:
           name: package.${{ matrix.runtime }}
           path: build/sourcegit_*.zip
+      - name: Delete temp artifacts
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: sourcegit.${{ matrix.runtime }}
   osx-app:
     name: Package OSX app
-    needs: build
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     strategy:
       matrix:
         runtime: [osx-x64, osx-arm64]
@@ -49,20 +48,26 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: sourcegit.${{ matrix.runtime }}
-          path: build/SourceGit
+          path: build
       - name: Package
         env:
           VERSION: ${{ inputs.version }}
           RUNTIME: ${{ matrix.runtime }}
-        run: ./build/scripts/package.osx-app.sh
+        run: |
+          mkdir build/SourceGit
+          tar -xf "build/sourcegit.${{ matrix.runtime }}.tar" -C build/SourceGit
+          ./build/scripts/package.osx-app.sh
       - name: Upload package artifact
         uses: actions/upload-artifact@v4
         with:
           name: package.${{ matrix.runtime }}
           path: build/sourcegit_*.zip
+      - name: Delete temp artifacts
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: sourcegit.${{ matrix.runtime }}
   linux:
     name: Package Linux
-    needs: build
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -96,3 +101,7 @@ jobs:
             build/sourcegit-*.AppImage
             build/sourcegit_*.deb
             build/sourcegit-*.rpm
+      - name: Delete temp artifacts
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: sourcegit.${{ matrix.runtime }}

.github/workflows/release.yml

@@ -4,6 +4,9 @@ on:
     tags:
       - v*
 jobs:
+  build:
+    name: Build
+    uses: ./.github/workflows/build.yml
   version:
     name: Prepare version string
     runs-on: ubuntu-latest
@@ -16,13 +19,13 @@ jobs:
           TAG: ${{ github.ref_name }}
         run: echo "version=${TAG#v}" >> "$GITHUB_OUTPUT"
   package:
-    needs: version
+    needs: [build, version]
     name: Package
     uses: ./.github/workflows/package.yml
     with:
       version: ${{ needs.version.outputs.version }}
   release:
-    needs: [version, package]
+    needs: [package, version]
     name: Release
     runs-on: ubuntu-latest
     permissions:
@@ -34,7 +37,8 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG: ${{ github.ref_name }}
-        run: gh release create "$TAG" -t "Release ${TAG#v}" --notes-from-tag
+          VERSION: ${{ needs.version.outputs.version }}
+        run: gh release create "$TAG" -t "Release $VERSION" --notes-from-tag
       - name: Download artifacts
         uses: actions/download-artifact@v4
         with:
@@ -45,5 +49,4 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           TAG: ${{ github.ref_name }}
-          VERSION: ${{ needs.version.outputs.version }}
         run: gh release upload "$TAG" packages/*

README.md

@@ -83,7 +83,6 @@ For **Linux** users:
 
 * `xdg-open` must be installed to support open native file manager.
 * Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your linux.
-* Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI.
 
 ## External Tools
 
@@ -123,7 +122,7 @@ This app supports open repository in external tools listed in the table below.
 
 * Custom
 
-  You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git)
+  You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git). And welcome to share your own themes.
 
 ## Contributing
 

VERSION

@@ -1 +1 @@
-8.26
+8.27

build/resources/rpm/SPECS/build.spec

@@ -5,8 +5,8 @@ Summary: Open-source & Free Git Gui Client
 License: MIT
 URL: https://sourcegit-scm.github.io/
 Source: https://github.com/sourcegit-scm/sourcegit/archive/refs/tags/v%_version.tar.gz
-Requires: libX11.so.6
-Requires: libSM.so.6
+Requires: libX11
+Requires: libSM
 
 %define _build_id_links none
 
@@ -19,7 +19,7 @@ mkdir -p %{buildroot}/%{_bindir}
 mkdir -p %{buildroot}/usr/share/applications
 mkdir -p %{buildroot}/usr/share/icons
 cp -f ../../../SourceGit/* %{buildroot}/opt/sourcegit/
-ln -sf ../../opt/sourcegit/sourcegit %{buildroot}/%{_bindir}
+ln -rsf %{buildroot}/opt/sourcegit/sourcegit %{buildroot}/%{_bindir}
 cp -r ../../_common/applications %{buildroot}/%{_datadir}
 cp -r ../../_common/icons %{buildroot}/%{_datadir}
 chmod 755 -R %{buildroot}/opt/sourcegit

build/scripts/package.linux.sh

@@ -60,7 +60,7 @@ mkdir -p resources/deb/usr/bin
 mkdir -p resources/deb/usr/share/applications
 mkdir -p resources/deb/usr/share/icons
 cp -f SourceGit/* resources/deb/opt/sourcegit
-ln -sf ../../opt/sourcegit/sourcegit resources/deb/usr/bin
+ln -rsf resources/deb/opt/sourcegit/sourcegit resources/deb/usr/bin
 cp -r resources/_common/applications resources/deb/usr/share
 cp -r resources/_common/icons resources/deb/usr/share
 sed -i -e "s/^Version:.*/Version: $VERSION/" -e "s/^Architecture:.*/Architecture: $arch/" resources/deb/DEBIAN/control

build/scripts/package.osx-app.sh

@@ -18,5 +18,6 @@ mkdir -p SourceGit.app/Contents/Resources
 mv SourceGit SourceGit.app/Contents/MacOS
 cp resources/app/App.icns SourceGit.app/Contents/Resources/App.icns
 sed "s/SOURCE_GIT_VERSION/$VERSION/g" resources/app/App.plist > SourceGit.app/Contents/Info.plist
+rm -rf SourceGit.app/Contents/MacOS/SourceGit.dsym
 
-zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit.app -x "*/*\.dsym/*"
+zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit.app

src/App.Commands.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Windows.Input;
+using Avalonia.Controls;
+
+namespace SourceGit
+{
+    public partial class App
+    {
+        public class SimpleCommand : ICommand
+        {
+            public event EventHandler CanExecuteChanged
+            {
+                add { }
+                remove { }
+            }
+
+            public SimpleCommand(Action action)
+            {
+                _action = action;
+            }
+
+            public bool CanExecute(object parameter) => _action != null;
+            public void Execute(object parameter) => _action?.Invoke();
+
+            private Action _action = null;
+        }
+
+        public class ParameterCommand : ICommand
+        {
+            public event EventHandler CanExecuteChanged
+            {
+                add { }
+                remove { }
+            }
+
+            public ParameterCommand(Action<object> action)
+            {
+                _action = action;
+            }
+
+            public bool CanExecute(object parameter) => _action != null;
+            public void Execute(object parameter) => _action?.Invoke(parameter);
+
+            private Action<object> _action = null;
+        }
+        
+        public static readonly SimpleCommand OpenPreferenceCommand = new SimpleCommand(() => OpenDialog(new Views.Preference()));
+        public static readonly SimpleCommand OpenHotkeysCommand = new SimpleCommand(() => OpenDialog(new Views.Hotkeys()));
+        public static readonly SimpleCommand OpenAppDataDirCommand = new SimpleCommand(() => Native.OS.OpenInFileManager(Native.OS.DataDir));
+        public static readonly SimpleCommand OpenAboutCommand = new SimpleCommand(() => OpenDialog(new Views.About()));
+        public static readonly SimpleCommand CheckForUpdateCommand = new SimpleCommand(() => Check4Update(true));
+        public static readonly SimpleCommand QuitCommand = new SimpleCommand(() => Quit(0));
+
+        public static readonly ParameterCommand CopyTextCommand = new ParameterCommand(param =>
+        {
+            if (param is TextBlock textBlock)
+            {
+                if (textBlock.Inlines is { Count: > 0 } inlines)
+                    CopyText(inlines.Text);
+                else
+                    CopyText(textBlock.Text);
+            }
+        });
+    }
+}