Merge b0a75932e9 into 22de6673bc

fix: onSHAPressed avoid right click nav (#770 )
- When the right click button is pressed it should not navigate to the parent. Navigation actions only should execute with the left button.
2024-12-24 20:57:19 -08:00 · 2024-12-01 00:11:53 +01:00 · 2024-11-30 19:31:13 +08:00 · 2024-11-30 11:25:39 +00:00 · 2024-11-30 19:25:20 +08:00 · 2024-11-30 09:23:35 +00:00
9 changed files with 94 additions and 19 deletions
--- a/README.md
+++ b/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-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)
+[![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)

 ## How to Use

--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@ -4,11 +4,11 @@
 <details>
 <summary>Missing Keys</summary>

- Text.Repository.FilterCommits
+- Text.WorkingCopy.CommitToEdit

 </details>

-### es_ES.axaml: 98.01%
+### es_ES.axaml: 97.87%


 <details>
@ -28,10 +28,11 @@
 - Text.Repository.HistoriesOrder.ByDate
 - Text.Repository.HistoriesOrder.Topo
 - Text.SHALinkCM.NavigateTo
+- Text.WorkingCopy.CommitToEdit

 </details>

-### fr_FR.axaml: 97.44%
+### fr_FR.axaml: 97.30%


 <details>
@ -55,10 +56,11 @@
 - Text.Repository.HistoriesOrder.Topo
 - Text.ScanRepositories
 - Text.SHALinkCM.NavigateTo
+- Text.WorkingCopy.CommitToEdit

 </details>

-### it_IT.axaml: 97.87%
+### it_IT.axaml: 97.73%


 <details>
@ -79,10 +81,11 @@
 - Text.Repository.HistoriesOrder.Topo
 - Text.SHALinkCM.CopySHA
 - Text.SHALinkCM.NavigateTo
+- Text.WorkingCopy.CommitToEdit

 </details>

-### pt_BR.axaml: 99.29%
+### pt_BR.axaml: 99.15%


 <details>
@ -93,16 +96,17 @@
 - Text.Preference.General.ShowChildren
 - Text.Repository.FilterCommits
 - Text.SHALinkCM.NavigateTo
+- Text.WorkingCopy.CommitToEdit

 </details>

-### ru_RU.axaml: 100.00%
+### ru_RU.axaml: 99.86%


 <details>
 <summary>Missing Keys</summary>

-
+- Text.WorkingCopy.CommitToEdit

 </details>

--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@ -546,6 +546,7 @@
  <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>
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@ -681,6 +681,7 @@
  <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>
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@ -684,6 +684,7 @@
  <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>
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@ -683,6 +683,7 @@
  <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>
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@ -519,6 +519,66 @@
  <Style Selector="Button.flat:disabled">
    <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">
--- a/src/Views/CommitBaseInfo.axaml.cs
+++ b/src/Views/CommitBaseInfo.axaml.cs
@ -151,7 +151,9 @@ namespace SourceGit.Views

        private void OnSHAPressed(object sender, PointerPressedEventArgs e)
        {
-            if (DataContext is ViewModels.CommitDetail detail && sender is Control { DataContext: string sha })
+            var point = e.GetCurrentPoint(this);
+
+            if (point.Properties.IsLeftButtonPressed && DataContext is ViewModels.CommitDetail detail && sender is Control { DataContext: string sha })
            {
                detail.NavigateTo(sha);
            }
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@ -243,16 +243,21 @@
                  Content="{DynamicResource Text.WorkingCopy.Amend}"/>

        <v:LoadingIcon Grid.Column="5" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/>
-
-        <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 Grid.Column="6"
+                     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>

        <Button Grid.Column="6"
                Classes="flat primary"
Author	SHA1	Message	Date
Göran W	a9f48f129e	Merge `b0a75932e9` into `22de6673bc`	2024-12-01 00:11:53 +01:00
Alberto de la Cruz	22de6673bc	fix: onSHAPressed avoid right click nav (#770 ) Some checks failed Continuous Integration / Build (push) Has been cancelled Details Continuous Integration / Prepare version string (push) Has been cancelled Details Localization Check / localization-check (push) Has been cancelled Details Continuous Integration / Package (push) Has been cancelled Details - When the right click button is pressed it should not navigate to the parent. Navigation actions only should execute with the left button.	2024-11-30 19:31:13 +08:00
github-actions[bot]	0b73f7b483	doc: Update translation status and missing keys	2024-11-30 11:25:39 +00:00
leo	c1368212df	feature: change the `CONTINUE` button to `SplitButton` to support editing/splitting original commit (#767 ) Signed-off-by: leo <longshuang@msn.cn>	2024-11-30 19:25:20 +08:00
github-actions[bot]	941ea4a695	doc: Update translation status and missing keys	2024-11-30 09:23:35 +00:00
Nils van Rijsinge	58d1122046	localization: add de_DE key for FilterCommits (#769 ) `8bd5bd864e`	2024-11-30 17:23:23 +08:00