Skip to content

Commit d2b8295

Browse files
committed
ux: show the git options in tooltip and use easy-to-understand descriptions for labels
Signed-off-by: leo <[email protected]>
1 parent 12efd85 commit d2b8295

File tree

5 files changed

+22
-14
lines changed

5 files changed

+22
-14
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,8 @@
621621
<x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">Default Clone Dir</x:String>
622622
<x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">User Email</x:String>
623623
<x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">Global git user email</x:String>
624-
<x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Enable --prune on fetch</x:String>
625-
<x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">Enable --ignore-cr-at-eol in diff</x:String>
624+
<x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">Prune dead branches after fetching</x:String>
625+
<x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">Ignore CR at end-of-line in text diff</x:String>
626626
<x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">Git (&gt;= 2.25.1) is required by this app</x:String>
627627
<x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">Install Path</x:String>
628628
<x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">Enable HTTP SSL Verify</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,8 @@
625625
<x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">默认克隆路径</x:String>
626626
<x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">邮箱</x:String>
627627
<x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">默认GIT用户邮箱</x:String>
628-
<x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">拉取更新时启用修剪(--prune)</x:String>
629-
<x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">对比文件时,默认忽略换行符变更 (--ignore-cr-at-eol)</x:String>
628+
<x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">拉取更新时启用修剪</x:String>
629+
<x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">对比文件时,默认忽略换行符变更</x:String>
630630
<x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">本软件要求GIT最低版本为2.25.1</x:String>
631631
<x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">安装路径</x:String>
632632
<x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">启用HTTP SSL验证</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,8 @@
625625
<x:String x:Key="Text.Preferences.Git.DefaultCloneDir" xml:space="preserve">預設複製 (clone) 路徑</x:String>
626626
<x:String x:Key="Text.Preferences.Git.Email" xml:space="preserve">電子郵件</x:String>
627627
<x:String x:Key="Text.Preferences.Git.Email.Placeholder" xml:space="preserve">預設 Git 使用者電子郵件</x:String>
628-
<x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">拉取變更時進行清理 (--prune)</x:String>
629-
<x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">對比檔案時,預設忽略行末的 CR 變更 (--ignore-cr-at-eol)</x:String>
628+
<x:String x:Key="Text.Preferences.Git.EnablePruneOnFetch" xml:space="preserve">拉取變更時進行清理</x:String>
629+
<x:String x:Key="Text.Preferences.Git.IgnoreCRAtEOLInDiff" xml:space="preserve">對比檔案時,預設忽略行末的 CR 變更</x:String>
630630
<x:String x:Key="Text.Preferences.Git.Invalid" xml:space="preserve">本軟體要求 Git 最低版本為 2.25.1</x:String>
631631
<x:String x:Key="Text.Preferences.Git.Path" xml:space="preserve">安裝路徑</x:String>
632632
<x:String x:Key="Text.Preferences.Git.SSLVerify" xml:space="preserve">啟用 HTTP SSL 驗證</x:String>

src/Views/Preferences.axaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -376,17 +376,20 @@
376376
<CheckBox Grid.Row="5" Grid.Column="1"
377377
Height="32"
378378
Content="{DynamicResource Text.Preferences.Git.EnablePruneOnFetch}"
379-
IsChecked="{Binding #ThisControl.EnablePruneOnFetch, Mode=TwoWay}"/>
379+
IsChecked="{Binding #ThisControl.EnablePruneOnFetch, Mode=TwoWay}"
380+
ToolTip.Tip="fetch.prune=true"/>
380381

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

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

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

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

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

src/Views/RepositoryConfigure.axaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,15 +164,18 @@
164164

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

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

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

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

0 commit comments

Comments
 (0)