From 1c345df37db53e416d98887d860c919ef8c8311e Mon Sep 17 00:00:00 2001 From: leo Date: Tue, 17 Dec 2024 11:24:59 +0800 Subject: [PATCH] ux: add some tooltips to checkboxes --- src/Resources/Locales/en_US.axaml | 2 +- src/Resources/Locales/zh_CN.axaml | 2 +- src/Resources/Locales/zh_TW.axaml | 2 +- src/Views/Apply.axaml | 3 ++- src/Views/Fetch.axaml | 9 ++++++--- src/Views/Pull.axaml | 6 ++++-- src/Views/Push.axaml | 12 ++++++++---- src/Views/StashChanges.axaml | 9 ++++++--- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml index 65b4dd96..73e82074 100644 --- a/src/Resources/Locales/en_US.axaml +++ b/src/Resources/Locales/en_US.axaml @@ -273,7 +273,7 @@ Fast-Forward (without checkout) Fetch Fetch all remotes - Enable '--force' option + Override refs check Fetch without tags Remote: Fetch Remote Changes diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml index f711cdee..e53af9a8 100644 --- a/src/Resources/Locales/zh_CN.axaml +++ b/src/Resources/Locales/zh_CN.axaml @@ -276,7 +276,7 @@ 快进(fast-forward,无需checkout) 拉取(fetch) 拉取所有的远程仓库 - 启用 --force 选项 + 覆盖REF检查 不拉取远程标签 远程仓库 : 拉取远程仓库内容 diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml index 90444967..e96f68ad 100644 --- a/src/Resources/Locales/zh_TW.axaml +++ b/src/Resources/Locales/zh_TW.axaml @@ -276,7 +276,7 @@ 快進 (fast-forward,無需 checkout) 提取 (fetch) 提取所有的遠端存放庫 - 啟用 [--force] 選項 + 覆寫 REFs 檢查 不提取遠端標籤 遠端存放庫: 提取遠端存放庫內容 diff --git a/src/Views/Apply.axaml b/src/Views/Apply.axaml index c3cb420c..a5100cd6 100644 --- a/src/Views/Apply.axaml +++ b/src/Views/Apply.axaml @@ -54,7 +54,8 @@ + IsChecked="{Binding IgnoreWhiteSpace, Mode=TwoWay}" + ToolTip.Tip="--ignore-whitespace"/> diff --git a/src/Views/Fetch.axaml b/src/Views/Fetch.axaml index f9380ab0..67669380 100644 --- a/src/Views/Fetch.axaml +++ b/src/Views/Fetch.axaml @@ -34,15 +34,18 @@ + IsChecked="{Binding Force, Mode=TwoWay}" + ToolTip.Tip="--force"/> + IsChecked="{Binding FetchAllRemotes, Mode=TwoWay}" + ToolTip.Tip="--all"/> + IsChecked="{Binding NoTags, Mode=TwoWay}" + ToolTip.Tip="--no-tags"/> diff --git a/src/Views/Pull.axaml b/src/Views/Pull.axaml index f6aa245f..50615bc6 100644 --- a/src/Views/Pull.axaml +++ b/src/Views/Pull.axaml @@ -99,11 +99,13 @@ + IsChecked="{Binding NoTags, Mode=TwoWay}" + ToolTip.Tip="--no-tags"/> + IsChecked="{Binding UseRebase, Mode=TwoWay}" + ToolTip.Tip="--rebase"/> diff --git a/src/Views/Push.axaml b/src/Views/Push.axaml index 87921c88..6bc02cff 100644 --- a/src/Views/Push.axaml +++ b/src/Views/Push.axaml @@ -83,21 +83,25 @@ Height="32" Content="{DynamicResource Text.Push.Tracking}" IsChecked="{Binding Tracking, Mode=TwoWay}" - IsVisible="{Binding IsSetTrackOptionVisible}"/> + IsVisible="{Binding IsSetTrackOptionVisible}" + ToolTip.Tip="-u"/> + IsVisible="{Binding IsCheckSubmodulesVisible}" + ToolTip.Tip="--recurse-submodules=check"/> + IsChecked="{Binding PushAllTags, Mode=TwoWay}" + ToolTip.Tip="--tags"/> + IsChecked="{Binding ForcePush, Mode=TwoWay}" + ToolTip.Tip="--force-with-lease"/> diff --git a/src/Views/StashChanges.axaml b/src/Views/StashChanges.axaml index b3e6254a..772b09e6 100644 --- a/src/Views/StashChanges.axaml +++ b/src/Views/StashChanges.axaml @@ -27,18 +27,21 @@ Height="32" Content="{DynamicResource Text.Stash.IncludeUntracked}" IsChecked="{Binding IncludeUntracked, Mode=TwoWay}" - IsVisible="{Binding !HasSelectedFiles}"/> + IsVisible="{Binding !HasSelectedFiles}" + ToolTip.Tip="--include-untracked"/> + IsVisible="{Binding !HasSelectedFiles}" + ToolTip.Tip="--staged"/> + IsChecked="{Binding KeepIndex, Mode=TwoWay}" + ToolTip.Tip="--keep-index"/>