Merge bb752f98df into f028513d49

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-99.86%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-97.30%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.73%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-99.15%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-99.86%25-yellow)](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-99.86%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-98.01%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-97.44%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.87%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-99.29%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

@@ -4,11 +4,11 @@
 <details>
 <summary>Missing Keys</summary>
 
-- Text.WorkingCopy.CommitToEdit
+- Text.Repository.FilterCommits
 
 </details>
 
-### es_ES.axaml: 97.87%
+### es_ES.axaml: 98.01%
 
 
 <details>
@@ -28,11 +28,10 @@
 - Text.Repository.HistoriesOrder.ByDate
 - Text.Repository.HistoriesOrder.Topo
 - Text.SHALinkCM.NavigateTo
-- Text.WorkingCopy.CommitToEdit
 
 </details>
 
-### fr_FR.axaml: 97.30%
+### fr_FR.axaml: 97.44%
 
 
 <details>
@@ -56,11 +55,10 @@
 - Text.Repository.HistoriesOrder.Topo
 - Text.ScanRepositories
 - Text.SHALinkCM.NavigateTo
-- Text.WorkingCopy.CommitToEdit
 
 </details>
 
-### it_IT.axaml: 97.73%
+### it_IT.axaml: 97.87%
 
 
 <details>
@@ -81,11 +79,10 @@
 - Text.Repository.HistoriesOrder.Topo
 - Text.SHALinkCM.CopySHA
 - Text.SHALinkCM.NavigateTo
-- Text.WorkingCopy.CommitToEdit
 
 </details>
 
-### pt_BR.axaml: 99.15%
+### pt_BR.axaml: 99.29%
 
 
 <details>
@@ -96,17 +93,16 @@
 - Text.Preference.General.ShowChildren
 - Text.Repository.FilterCommits
 - Text.SHALinkCM.NavigateTo
-- Text.WorkingCopy.CommitToEdit
 
 </details>
 
-### ru_RU.axaml: 99.86%
+### ru_RU.axaml: 100.00%
 
 
 <details>
 <summary>Missing Keys</summary>
 
-- Text.WorkingCopy.CommitToEdit
+
 
 </details>
 

src/Resources/Locales/de_DE.axaml

@@ -546,7 +546,6 @@
   <x:String x:Key="Text.Repository.EnableReflog" xml:space="preserve">Aktiviere '--reflog' Option</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Öffne im Datei-Browser</x:String>
   <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Suche Branches/Tags/Submodule</x:String>
-  <x:String x:Key="Text.Repository.FilterCommits" xml:space="preserve">Sichtbarkeit im Graphen</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Aufheben</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Im Graph ausblenden</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Im Graph filtern</x:String>

src/Resources/Locales/en_US.axaml

@@ -685,7 +685,6 @@
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">Template/Histories</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Trigger click event</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Edit)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stage all changes and commit</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTS DETECTED</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -684,7 +684,6 @@
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交并推送</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">历史输入/模板</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">触发点击事件</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">提交（修改原始提交）</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">自动暂存所有变更并提交</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)？</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">检测到冲突</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -683,7 +683,6 @@
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交並推送</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">歷史輸入/範本</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">觸發點擊事件</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">提交（修改現有提交）</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">自動暫存全部變更並提交</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">檢測到衝突</x:String>

src/Resources/Styles.axaml

@@ -520,66 +520,6 @@
     <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.Background}"/>
   </Style>
 
-  <Style Selector="SplitButton">
-    <Setter Property="MinHeight" Value="24"/>
-    <Setter Property="Template">
-      <ControlTemplate>
-        <Grid>
-          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="1" />
-            <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-
-          <Button x:Name="PART_PrimaryButton"
-                  Grid.Column="0"
-                  Classes="flat primary"
-                  MinWidth="32"
-                  HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch"
-                  Content="{TemplateBinding Content}"
-                  ContentTemplate="{TemplateBinding ContentTemplate}"
-                  Command="{TemplateBinding Command}"
-                  CommandParameter="{TemplateBinding CommandParameter}"
-                  CornerRadius="3,0,0,3"
-                  Padding="{TemplateBinding Padding}"
-                  Focusable="False"
-                  KeyboardNavigation.IsTabStop="False" />
-
-          <Button x:Name="PART_SecondaryButton"
-                  Grid.Column="2"
-                  Classes="flat primary"
-                  Width="32"
-                  CornerRadius="0,3,3,0"
-                  Padding="0"
-                  Focusable="False"
-                  HorizontalAlignment="Stretch"
-                  VerticalAlignment="Stretch"
-                  KeyboardNavigation.IsTabStop="False">
-            <Path Height="12" Width="12"
-                  Margin="0,4,0,0"
-                  Fill="{DynamicResource AccentButtonForeground}"
-                  Data="{DynamicResource Icons.Down}"/>
-          </Button>
-        </Grid>
-      </ControlTemplate>
-    </Setter>
-    
-    <Style Selector="^:disabled /template/ Button">
-      <Setter Property="BorderThickness" Value="1"/>
-      <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}"/>
-      <Setter Property="Background" Value="Transparent"/>
-    </Style>
-    
-    <Style Selector="^:disabled TextBlock">
-      <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/>
-    </Style>
-    
-    <Style Selector="^:disabled Path">
-      <Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/>
-    </Style>
-  </Style>
-
   <Style Selector="aes|SearchPanel">
     <Setter Property="Template">
       <ControlTemplate TargetType="aes:SearchPanel">

src/Views/CommitBaseInfo.axaml.cs

@@ -151,9 +151,7 @@ namespace SourceGit.Views
 
         private void OnSHAPressed(object sender, PointerPressedEventArgs e)
         {
-            var point = e.GetCurrentPoint(this);
-
-            if (point.Properties.IsLeftButtonPressed && DataContext is ViewModels.CommitDetail detail && sender is Control { DataContext: string sha })
+            if (DataContext is ViewModels.CommitDetail detail && sender is Control { DataContext: string sha })
             {
                 detail.NavigateTo(sha);
             }

src/Views/InteractiveRebase.axaml

@@ -65,7 +65,6 @@
               <Setter Property="Margin" Value="0"/>
               <Setter Property="Padding" Value="0"/>
               <Setter Property="Height" Value="28"/>
-              <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
             </Style>
           </ListBox.Styles>
 
@@ -77,7 +76,7 @@
 
           <ListBox.ItemTemplate>
             <DataTemplate DataType="vm:InteractiveRebaseItem">
-              <Grid ColumnDefinitions="16,110,*,456" Margin="8,0" ClipToBounds="True">
+              <Grid ColumnDefinitions="16,110,*,140,96,156,32,32">
                 <!-- Drag & Drop Anchor -->
                 <Border Grid.Column="0" Background="Transparent"
                         Loaded="OnSetupRowHeaderDragDrop"
@@ -188,45 +187,41 @@
                   <TextBlock Grid.Column="1" Classes="primary" Margin="0,0,4,0" Text="{Binding Subject}"/>
                 </Grid>
 
-                <Grid Grid.Column="3" ColumnDefinitions="32,108,96,156,32,32" IsHitTestVisible="False" ClipToBounds="True">
-                  <!-- Author Avatar -->
+                <!-- Author -->
+                <Grid Grid.Column="3" ColumnDefinitions="Auto,*" Width="140" ClipToBounds="True">
                   <v:Avatar Grid.Column="0"
                             Width="16" Height="16"
                             Margin="8,0,0,0"
                             VerticalAlignment="Center"
+                            IsHitTestVisible="False"
                             User="{Binding Commit.Author}"/>
-
-                  <!-- Author Name -->
                   <TextBlock Grid.Column="1"
                              Classes="primary"
-                             MaxWidth="90"
                              Margin="6,0,12,0"
                              Text="{Binding Commit.Author.Name}"
                              HorizontalAlignment="Left"/>
+                </Grid>
                 
                 <!-- Commit SHA -->
-                  <Border Grid.Column="2" ClipToBounds="True">
+                <Border Grid.Column="4" IsHitTestVisible="False" ClipToBounds="True">
                   <TextBlock Classes="primary"
                              Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
                              HorizontalAlignment="Center"/>
                 </Border>
 
                 <!-- Commit Time -->
-                  <Border Grid.Column="3" ClipToBounds="True">
-                    <TextBlock Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
-                  </Border>
+                <TextBlock Grid.Column="5" Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
 
                 <!-- MoveUp Button -->
-                  <Button Grid.Column="4" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
+                <Button Grid.Column="6" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
                   <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Up}"/>
                 </Button>
                 
                 <!-- MoveDown Button -->
-                  <Button Grid.Column="5" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down">
+                <Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down">
                   <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Down}"/>
                 </Button>
               </Grid>
-              </Grid>
             </DataTemplate>
           </ListBox.ItemTemplate>
         </v:InteractiveRebaseListBox>

src/Views/RepositoryToolbar.axaml.cs

@@ -50,6 +50,9 @@ namespace SourceGit.Views
             if (launcher is not null && DataContext is ViewModels.Repository repo)
             {
                 var startDirectly = launcher.HasKeyModifier(KeyModifiers.Control);
+                if (!startDirectly && OperatingSystem.IsMacOS())
+                    startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
+
                 launcher.ClearKeyModifier();
                 repo.Fetch(startDirectly);
                 e.Handled = true;
@@ -62,6 +65,9 @@ namespace SourceGit.Views
             if (launcher is not null && DataContext is ViewModels.Repository repo)
             {
                 var startDirectly = launcher.HasKeyModifier(KeyModifiers.Control);
+                if (!startDirectly && OperatingSystem.IsMacOS())
+                    startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
+
                 launcher.ClearKeyModifier();
                 repo.Pull(startDirectly);
                 e.Handled = true;
@@ -74,6 +80,9 @@ namespace SourceGit.Views
             if (launcher is not null && DataContext is ViewModels.Repository repo)
             {
                 var startDirectly = launcher.HasKeyModifier(KeyModifiers.Control);
+                if (!startDirectly && OperatingSystem.IsMacOS())
+                    startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
+
                 launcher.ClearKeyModifier();
                 repo.Push(startDirectly);
                 e.Handled = true;
@@ -86,6 +95,9 @@ namespace SourceGit.Views
             if (launcher is not null && DataContext is ViewModels.Repository repo)
             {
                 var startDirectly = launcher.HasKeyModifier(KeyModifiers.Control);
+                if (!startDirectly && OperatingSystem.IsMacOS())
+                    startDirectly = launcher.HasKeyModifier(KeyModifiers.Meta);
+
                 launcher.ClearKeyModifier();
                 repo.StashAll(startDirectly);
                 e.Handled = true;

src/Views/WorkingCopy.axaml

@@ -244,20 +244,15 @@
 
         <v:LoadingIcon Grid.Column="5" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/>
 
-        <SplitButton Grid.Column="6"
+        <Button Grid.Column="6"
+                Classes="flat primary"
                 Content="{DynamicResource Text.Repository.Continue}"
                 Height="28"
                 Margin="8,0,0,0"
                 Padding="8,0"
                 Command="{Binding ContinueMerge}"
                 IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"
-                     IsEnabled="{Binding !HasUnsolvedConflicts}">
-          <SplitButton.Flyout>
-            <MenuFlyout>
-              <MenuItem Header="{DynamicResource Text.WorkingCopy.CommitToEdit}" Command="{Binding Commit}"/>
-            </MenuFlyout>
-          </SplitButton.Flyout>
-        </SplitButton>
+                IsEnabled="{Binding !HasUnsolvedConflicts}"/>
 
         <Button Grid.Column="6"
                 Classes="flat primary"