.editorconfig

@@ -293,10 +293,6 @@ end_of_line = lf
 [*.{cmd,bat}]
 end_of_line = crlf
 
-# Package manifests
-[{*.spec,control}]
-end_of_line = lf
-
 # YAML files
 [*.{yml,yaml}]
 indent_size = 2

.gitattributes

@@ -3,12 +3,10 @@
 *.png      binary
 *.ico      binary
 *.sh       text eol=lf
-*.spec     text eol=lf
-control    text eol=lf
 *.bat      text eol=crlf
 *.cmd      text eol=crlf
 *.ps1      text eol=crlf
 *.json     text
 
 .gitattributes export-ignore
-.gitignore     export-ignore
+.gitignore     export-ignore

.github/workflows/package.yml

@@ -3,7 +3,7 @@ on:
   workflow_call:
     inputs:
       version:
-        description: SourceGit package version
+        description: Source Git package version
         required: true
         type: string
 jobs:

README.md

@@ -47,7 +47,7 @@
 
 ## Translation Status
 
-[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-100.00%25-brightgreen)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.57%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-86.31%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-99.57%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
+[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-98.41%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.57%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-86.31%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-99.57%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
 
 ## How to Use
 

TRANSLATION.md

@@ -1,10 +1,20 @@
-### de_DE.axaml: 100.00%
+### de_DE.axaml: 98.41%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-
+- Text.Diff.SaveAsPatch
+- Text.Diff.VisualLines.All
+- Text.Hotkeys.Repo.CreateBranchOnCommit
+- Text.Hotkeys.Repo.Fetch
+- Text.Hotkeys.Repo.Pull
+- Text.Hotkeys.Repo.Push
+- Text.IssueLinkCM.OpenInBrowser
+- Text.IssueLinkCM.CopyLink
+- Text.Preference.Appearance.FontSize
+- Text.Preference.Appearance.FontSize.Default
+- Text.Preference.Appearance.FontSize.Editor
 
 </details>
 

build/resources/_common/applications/sourcegit.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=SourceGit
+Name=Source Git
 Comment=Open-source & Free Git GUI Client
 Exec=/opt/sourcegit/sourcegit
 Icon=/usr/share/icons/sourcegit.png

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()(%{__isa_bits}bit)
-Requires: libSM.so.6()(%{__isa_bits}bit)
+Requires: (libX11 or libX11-6)
+Requires: (libSM or libSM6)
 
 %define _build_id_links none
 

build/scripts/package.linux.sh

@@ -5,6 +5,16 @@ set -o
 set -u
 set pipefail
 
+if [[ -z "$VERSION" ]]; then
+    echo "Provide the version as environment variable VERSION"
+    exit 1
+fi
+
+if [[ -z "$RUNTIME" ]]; then
+    echo "Provide the runtime as environment variable RUNTIME"
+    exit 1
+fi
+
 arch=
 appimage_arch=
 target=

build/scripts/package.osx-app.sh

@@ -5,6 +5,16 @@ set -o
 set -u
 set pipefail
 
+if [[ -z "$VERSION" ]]; then
+    echo "Provide the version as environment variable VERSION"
+    exit 1
+fi
+
+if [[ -z "$RUNTIME" ]]; then
+    echo "Provide the runtime as environment variable RUNTIME"
+    exit 1
+fi
+
 cd build
 
 mkdir -p SourceGit.app/Contents/Resources

build/scripts/package.windows-portable.sh

@@ -5,6 +5,16 @@ set -o
 set -u
 set pipefail
 
+if [[ -z "$VERSION" ]]; then
+    echo "Provide the version as environment variable VERSION"
+    exit 1
+fi
+
+if [[ -z "$RUNTIME" ]]; then
+    echo "Provide the runtime as environment variable RUNTIME"
+    exit 1
+fi
+
 cd build
 
 rm -rf SourceGit/*.pdb

src/Commands/Fetch.cs

@@ -16,7 +16,7 @@ namespace SourceGit.Commands
             if (noTags)
                 Args += "--no-tags ";
             else
-                Args += "--tags ";
+                Args += "--force ";
 
             if (prune)
                 Args += "--prune ";

src/Resources/Locales/de_DE.axaml

@@ -240,7 +240,6 @@
   <x:String x:Key="Text.Diff.Next" xml:space="preserve">Nächste Änderung</x:String>
   <x:String x:Key="Text.Diff.NoChange" xml:space="preserve">KEINE ÄNDERUNG ODER NUR ZEILEN-ENDE ÄNDERUNGEN</x:String>
   <x:String x:Key="Text.Diff.Prev" xml:space="preserve">Vorherige Änderung</x:String>
-  <x:String x:Key="Text.Diff.SaveAsPatch" xml:space="preserve">Als Patch speichern</x:String>
   <x:String x:Key="Text.Diff.ShowHiddenSymbols" xml:space="preserve">Zeige versteckte Symbole</x:String>
   <x:String x:Key="Text.Diff.SideBySide" xml:space="preserve">Nebeneinander</x:String>
   <x:String x:Key="Text.Diff.Submodule" xml:space="preserve">SUBMODUL</x:String>
@@ -249,7 +248,6 @@
   <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Syntax Hervorhebung</x:String>
   <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">Zeilenumbruch</x:String>
   <x:String x:Key="Text.Diff.UseMerger" xml:space="preserve">Öffne in Merge Tool</x:String>
-  <x:String x:Key="Text.Diff.VisualLines.All" xml:space="preserve">Alle Zeilen anzeigen</x:String>
   <x:String x:Key="Text.Diff.VisualLines.Decr" xml:space="preserve">Weniger Zeilen anzeigen</x:String>
   <x:String x:Key="Text.Diff.VisualLines.Incr" xml:space="preserve">Mehr Zeilen anzeigen</x:String>
   <x:String x:Key="Text.Diff.Welcome" xml:space="preserve">WÄHLE EINE DATEI AUS UM ÄNDERUNGEN ANZUZEIGEN</x:String>
@@ -366,12 +364,8 @@
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Gestagte Änderungen committen</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Gestagte Änderungen committen und pushen</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.CommitWithAutoStage" xml:space="preserve">Alle Änderungen stagen und committen</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.CreateBranchOnCommit" xml:space="preserve">Neuen Branch basierend auf ausgewählten Commit erstellen</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.DiscardSelected" xml:space="preserve">Ausgewählte Änderungen verwerfen</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Fetch, wird direkt ausgeführt</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">Dashboard Modus (Standard)</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Pull, wird direkt ausgeführt</x:String>
-  <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">Push, wird direkt ausgeführt</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Erzwinge Neuladen des Repositorys</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.StageOrUnstageSelected" xml:space="preserve">Ausgewählte Änderungen stagen/unstagen</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Commit-Suchmodus</x:String>
@@ -395,8 +389,6 @@
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interaktiver Rebase</x:String>
   <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Ziel Branch:</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">Auf:</x:String>
-  <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">In Browser öffnen</x:String>
-  <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Link kopieren</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">FEHLER</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">INFO</x:String>
   <x:String x:Key="Text.Merge" xml:space="preserve">Branch mergen</x:String>
@@ -437,9 +429,6 @@
   <x:String x:Key="Text.Preference.AI.Model" xml:space="preserve">Modell</x:String>
   <x:String x:Key="Text.Preference.Appearance" xml:space="preserve">DARSTELLUNG</x:String>
   <x:String x:Key="Text.Preference.Appearance.DefaultFont" xml:space="preserve">Standardschriftart</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize" xml:space="preserve">Schriftgröße</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Default" xml:space="preserve">Standard</x:String>
-  <x:String x:Key="Text.Preference.Appearance.FontSize.Editor" xml:space="preserve">Texteditor</x:String>
   <x:String x:Key="Text.Preference.Appearance.MonospaceFont" xml:space="preserve">Monospace-Schriftart</x:String>
   <x:String x:Key="Text.Preference.Appearance.OnlyUseMonoFontInEditor" xml:space="preserve">Verwende die Monospace-Schriftart nur im Texteditor</x:String>
   <x:String x:Key="Text.Preference.Appearance.Theme" xml:space="preserve">Design</x:String>

src/Resources/Styles.axaml

@@ -168,13 +168,12 @@
     <Setter Property="TextBlock.TextDecorations" Value=""/>
     <Setter Property="Template">
       <ControlTemplate>
-        <Grid Effect="drop-shadow(0 0 8 #30000000)">
+        <Grid Effect="drop-shadow(0 0 8 #80000000)">
           <Border Margin="8"
                   Padding="8,6"
                   CornerRadius="4"
                   Background="{DynamicResource Brush.Popup}"
-                  BorderBrush="{DynamicResource Brush.Border2}"
-                  BorderThickness="1"
+                  BorderThickness="0"
                   MaxWidth="{TemplateBinding MaxWidth}"
                   MinHeight="{TemplateBinding MinHeight}"
                   HorizontalAlignment="{TemplateBinding HorizontalAlignment}">

src/ViewModels/CommitDetail.cs

@@ -169,11 +169,6 @@ namespace SourceGit.ViewModels
             SearchChangeFilter = string.Empty;
         }
 
-        public Models.Commit GetParent(string sha)
-        {
-            return new Commands.QuerySingleCommit(_repo.FullPath, sha).Result();
-        }
-
         public List<Models.Object> GetRevisionFilesUnderFolder(string parentFolder)
         {
             return new Commands.QueryRevisionObjects(_repo.FullPath, _commit.SHA, parentFolder).Result();

src/Views/CommitBaseInfo.axaml

@@ -117,28 +117,7 @@
                            TextDecorations="Underline"
                            Cursor="Hand"
                            Margin="0,0,16,0"
-                           PointerEntered="OnSHAPointerEntered"
-                           PointerPressed="OnSHAPressed">
-                  <TextBlock.Styles>
-                    <Style Selector="ToolTip">
-                      <Setter Property="MaxWidth" Value="600"/>
-                    </Style>
-                  </TextBlock.Styles>
-
-                  <TextBlock.DataTemplates>
-                    <DataTemplate DataType="m:Commit">
-                      <StackPanel MinWidth="400" Orientation="Vertical">
-                        <Grid ColumnDefinitions="Auto,*,Auto">
-                          <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                          <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                          <TextBlock Grid.Column="2" Classes="primary" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
-                        </Grid>
-
-                        <TextBlock Classes="primary" Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
-                      </StackPanel>
-                    </DataTemplate>
-                  </TextBlock.DataTemplates>
-                 </TextBlock>
+                           PointerPressed="OnSHAPressed"/>
               </DataTemplate>
             </ItemsControl.ItemTemplate>
           </ItemsControl>

src/Views/CommitBaseInfo.axaml.cs

@@ -1,5 +1,3 @@
-using System.Threading.Tasks;
-
 using Avalonia;
 using Avalonia.Collections;
 using Avalonia.Controls;
@@ -115,29 +113,6 @@ namespace SourceGit.Views
             e.Handled = true;
         }
 
-        private async void OnSHAPointerEntered(object sender, PointerEventArgs e)
-        {
-            if (DataContext is ViewModels.CommitDetail detail && sender is Control { DataContext: string sha } ctl)
-            {
-                var tooltip = ToolTip.GetTip(ctl);
-                if (tooltip is Models.Commit commit && commit.SHA == sha)
-                {
-                    ToolTip.SetIsOpen(ctl, true);
-                }
-                else
-                {
-                    var c = await Task.Run(() => detail.GetParent(sha));
-                    if (c != null)
-                    {
-                        ToolTip.SetTip(ctl, c);
-                        ToolTip.SetIsOpen(ctl, true);
-                    }
-                }
-            }
-
-            e.Handled = true;
-        }
-
         private void OnSHAPressed(object sender, PointerPressedEventArgs e)
         {
             if (DataContext is ViewModels.CommitDetail detail && sender is Control { DataContext: string sha })