ux: show the git options in tooltip and use easy-to-understand descriptions for labels

Signed-off-by: leo <longshuang@msn.cn>
2026-04-21 13:20:30 +08:00 · 2026-01-15 16:41:27 +08:00
parent 12efd855b1
commit d2b8295ecc
5 changed files with 22 additions and 14 deletions
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -621,8 +621,8 @@
  <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Default Clone Dir</x:String>
  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">User Email</x:String>
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Global git user email</x:String>
-  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Enable --prune on fetch</x:String>
-  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">Enable --ignore-cr-at-eol in diff</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Prune dead branches after fetching</x:String>
+  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">Ignore CR at end-of-line in text diff</x:String>
  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.25.1) is required by this app</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Install Path</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Enable HTTP SSL Verify</x:String>
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -625,8 +625,8 @@
  <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">默认克隆路径</x:String>
  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">邮箱</x:String>
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">默认GIT用户邮箱</x:String>
-  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">拉取更新时启用修剪（--prune）</x:String>
-  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">对比文件时，默认忽略换行符变更 (--ignore-cr-at-eol)</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">拉取更新时启用修剪</x:String>
+  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">对比文件时，默认忽略换行符变更</x:String>
  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">本软件要求GIT最低版本为2.25.1</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">安装路径</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">启用HTTP SSL验证</x:String>
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -625,8 +625,8 @@
  <x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">預設複製 (clone) 路徑</x:String>
  <x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">電子郵件</x:String>
  <x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">預設 Git 使用者電子郵件</x:String>
-  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">拉取變更時進行清理 (--prune)</x:String>
-  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">對比檔案時，預設忽略行末的 CR 變更 (--ignore-cr-at-eol)</x:String>
+  <x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">拉取變更時進行清理</x:String>
+  <x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">對比檔案時，預設忽略行末的 CR 變更</x:String>
  <x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">本軟體要求 Git 最低版本為 2.25.1</x:String>
  <x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">安裝路徑</x:String>
  <x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">啟用 HTTP SSL 驗證</x:String>
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -376,17 +376,20 @@
            <CheckBox Grid.Row="5" Grid.Column="1"
                      Height="32"
                      Content="{DynamicResource Text.Preferences.Git.EnablePruneOnFetch}"
-                      IsChecked="{Binding #ThisControl.EnablePruneOnFetch, Mode=TwoWay}"/>
+                      IsChecked="{Binding #ThisControl.EnablePruneOnFetch, Mode=TwoWay}"
+                      ToolTip.Tip="fetch.prune=true"/>

            <CheckBox Grid.Row="6" Grid.Column="1"
                      Height="32"
                      Content="{DynamicResource Text.Preferences.Git.IgnoreCRAtEOLInDiff}"
-                      IsChecked="{Binding IgnoreCRAtEOLInDiff, Mode=TwoWay}"/>
+                      IsChecked="{Binding IgnoreCRAtEOLInDiff, Mode=TwoWay}"
+                      ToolTip.Tip="--ignore-cr-at-eol"/>

            <CheckBox Grid.Row="7" Grid.Column="1"
                      Height="32"
                      Content="{DynamicResource Text.Preferences.Git.SSLVerify}"
-                      IsChecked="{Binding #ThisControl.EnableHTTPSSLVerify, Mode=TwoWay}"/>
+                      IsChecked="{Binding #ThisControl.EnableHTTPSSLVerify, Mode=TwoWay}"
+                      ToolTip.Tip="http.sslverify=true"/>

            <CheckBox Grid.Row="8" Grid.Column="1"
                      Height="32"
@@ -452,11 +455,13 @@

            <CheckBox Grid.Row="3" Grid.Column="1"
                      Content="{DynamicResource Text.Preferences.GPG.CommitEnabled}"
-                      IsChecked="{Binding #ThisControl.EnableGPGCommitSigning, Mode=TwoWay}"/>
+                      IsChecked="{Binding #ThisControl.EnableGPGCommitSigning, Mode=TwoWay}"
+                      ToolTip.Tip="commit.gpgsign=true"/>

            <CheckBox Grid.Row="4" Grid.Column="1"
                      Content="{DynamicResource Text.Preferences.GPG.TagEnabled}"
-                      IsChecked="{Binding #ThisControl.EnableGPGTagSigning, Mode=TwoWay}"/>
+                      IsChecked="{Binding #ThisControl.EnableGPGTagSigning, Mode=TwoWay}"
+                      ToolTip.Tip="tag.gpgsign=true"/>
          </Grid>
        </TabItem>

--- a/src/Views/RepositoryConfigure.axaml
+++ b/src/Views/RepositoryConfigure.axaml
@@ -164,15 +164,18 @@

          <CheckBox Grid.Row="7" Grid.Column="1"
                    Content="{DynamicResource Text.Preferences.GPG.CommitEnabled}"
-                    IsChecked="{Binding GPGCommitSigningEnabled, Mode=TwoWay}"/>
+                    IsChecked="{Binding GPGCommitSigningEnabled, Mode=TwoWay}"
+                    ToolTip.Tip="commit.gpgsign=true"/>

          <CheckBox Grid.Row="8" Grid.Column="1"
                    Content="{DynamicResource Text.Preferences.GPG.TagEnabled}"
-                    IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"/>
+                    IsChecked="{Binding GPGTagSigningEnabled, Mode=TwoWay}"
+                    ToolTip.Tip="tag.gpgsign=true"/>

          <CheckBox Grid.Row="9" Grid.Column="1"
                    Content="{DynamicResource Text.Preferences.Git.EnablePruneOnFetch}"
-                    IsChecked="{Binding EnablePruneOnFetch, Mode=TwoWay}"/>
+                    IsChecked="{Binding EnablePruneOnFetch, Mode=TwoWay}"
+                    ToolTip.Tip="fetch.prune=true"/>

          <CheckBox Grid.Row="10" Grid.Column="1"
                    Content="{DynamicResource Text.Configure.Git.AskBeforeAutoUpdatingSubmodules}"