Skip to content

Commit 1c345df

Browse files
committed
ux: add some tooltips to checkboxes
1 parent c768b17 commit 1c345df

File tree

8 files changed

+29
-16
lines changed

8 files changed

+29
-16
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@
273273
<x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">Fast-Forward (without checkout)</x:String>
274274
<x:String x:Key="Text.Fetch" xml:space="preserve">Fetch</x:String>
275275
<x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">Fetch all remotes</x:String>
276-
<x:String x:Key="Text.Fetch.Force" xml:space="preserve">Enable '--force' option</x:String>
276+
<x:String x:Key="Text.Fetch.Force" xml:space="preserve">Override refs check</x:String>
277277
<x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Fetch without tags</x:String>
278278
<x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Remote:</x:String>
279279
<x:String x:Key="Text.Fetch.Title" xml:space="preserve">Fetch Remote Changes</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">快进(fast-forward,无需checkout)</x:String>
277277
<x:String x:Key="Text.Fetch" xml:space="preserve">拉取(fetch)</x:String>
278278
<x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">拉取所有的远程仓库</x:String>
279-
<x:String x:Key="Text.Fetch.Force" xml:space="preserve">启用 --force 选项</x:String>
279+
<x:String x:Key="Text.Fetch.Force" xml:space="preserve">覆盖REF检查</x:String>
280280
<x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">不拉取远程标签</x:String>
281281
<x:String x:Key="Text.Fetch.Remote" xml:space="preserve">远程仓库 :</x:String>
282282
<x:String x:Key="Text.Fetch.Title" xml:space="preserve">拉取远程仓库内容</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@
276276
<x:String x:Key="Text.FastForwardWithoutCheck" xml:space="preserve">快進 (fast-forward,無需 checkout)</x:String>
277277
<x:String x:Key="Text.Fetch" xml:space="preserve">提取 (fetch)</x:String>
278278
<x:String x:Key="Text.Fetch.AllRemotes" xml:space="preserve">提取所有的遠端存放庫</x:String>
279-
<x:String x:Key="Text.Fetch.Force" xml:space="preserve">啟用 [--force] 選項</x:String>
279+
<x:String x:Key="Text.Fetch.Force" xml:space="preserve">覆寫 REFs 檢查</x:String>
280280
<x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">不提取遠端標籤</x:String>
281281
<x:String x:Key="Text.Fetch.Remote" xml:space="preserve">遠端存放庫:</x:String>
282282
<x:String x:Key="Text.Fetch.Title" xml:space="preserve">提取遠端存放庫內容</x:String>

src/Views/Apply.axaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@
5454

5555
<CheckBox Grid.Row="2" Grid.Column="1"
5656
Content="{DynamicResource Text.Apply.IgnoreWS}"
57-
IsChecked="{Binding IgnoreWhiteSpace, Mode=TwoWay}"/>
57+
IsChecked="{Binding IgnoreWhiteSpace, Mode=TwoWay}"
58+
ToolTip.Tip="--ignore-whitespace"/>
5859
</Grid>
5960
</StackPanel>
6061
</UserControl>

src/Views/Fetch.axaml

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

3535
<CheckBox Grid.Row="1" Grid.Column="1"
3636
Content="{DynamicResource Text.Fetch.Force}"
37-
IsChecked="{Binding Force, Mode=TwoWay}"/>
37+
IsChecked="{Binding Force, Mode=TwoWay}"
38+
ToolTip.Tip="--force"/>
3839

3940
<CheckBox Grid.Row="2" Grid.Column="1"
4041
Content="{DynamicResource Text.Fetch.AllRemotes}"
41-
IsChecked="{Binding FetchAllRemotes, Mode=TwoWay}"/>
42+
IsChecked="{Binding FetchAllRemotes, Mode=TwoWay}"
43+
ToolTip.Tip="--all"/>
4244

4345
<CheckBox Grid.Row="3" Grid.Column="1"
4446
Content="{DynamicResource Text.Fetch.NoTags}"
45-
IsChecked="{Binding NoTags, Mode=TwoWay}"/>
47+
IsChecked="{Binding NoTags, Mode=TwoWay}"
48+
ToolTip.Tip="--no-tags"/>
4649
</Grid>
4750
</StackPanel>
4851
</UserControl>

src/Views/Pull.axaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,13 @@
9999

100100
<CheckBox Grid.Row="5" Grid.Column="1"
101101
Content="{DynamicResource Text.Pull.NoTags}"
102-
IsChecked="{Binding NoTags, Mode=TwoWay}"/>
102+
IsChecked="{Binding NoTags, Mode=TwoWay}"
103+
ToolTip.Tip="--no-tags"/>
103104

104105
<CheckBox Grid.Row="6" Grid.Column="1"
105106
Content="{DynamicResource Text.Pull.UseRebase}"
106-
IsChecked="{Binding UseRebase, Mode=TwoWay}"/>
107+
IsChecked="{Binding UseRebase, Mode=TwoWay}"
108+
ToolTip.Tip="--rebase"/>
107109
</Grid>
108110
</StackPanel>
109111
</UserControl>

src/Views/Push.axaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,25 @@
8383
Height="32"
8484
Content="{DynamicResource Text.Push.Tracking}"
8585
IsChecked="{Binding Tracking, Mode=TwoWay}"
86-
IsVisible="{Binding IsSetTrackOptionVisible}"/>
86+
IsVisible="{Binding IsSetTrackOptionVisible}"
87+
ToolTip.Tip="-u"/>
8788

8889
<CheckBox Grid.Row="4" Grid.Column="1"
8990
Height="32"
9091
Content="{DynamicResource Text.Push.CheckSubmodules}"
9192
IsChecked="{Binding CheckSubmodules, Mode=TwoWay}"
92-
IsVisible="{Binding IsCheckSubmodulesVisible}"/>
93+
IsVisible="{Binding IsCheckSubmodulesVisible}"
94+
ToolTip.Tip="--recurse-submodules=check"/>
9395

9496
<CheckBox Grid.Row="5" Grid.Column="1"
9597
Content="{DynamicResource Text.Push.WithAllTags}"
96-
IsChecked="{Binding PushAllTags, Mode=TwoWay}"/>
98+
IsChecked="{Binding PushAllTags, Mode=TwoWay}"
99+
ToolTip.Tip="--tags"/>
97100

98101
<CheckBox Grid.Row="6" Grid.Column="1"
99102
Content="{DynamicResource Text.Push.Force}"
100-
IsChecked="{Binding ForcePush, Mode=TwoWay}"/>
103+
IsChecked="{Binding ForcePush, Mode=TwoWay}"
104+
ToolTip.Tip="--force-with-lease"/>
101105
</Grid>
102106
</StackPanel>
103107
</UserControl>

src/Views/StashChanges.axaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,21 @@
2727
Height="32"
2828
Content="{DynamicResource Text.Stash.IncludeUntracked}"
2929
IsChecked="{Binding IncludeUntracked, Mode=TwoWay}"
30-
IsVisible="{Binding !HasSelectedFiles}"/>
30+
IsVisible="{Binding !HasSelectedFiles}"
31+
ToolTip.Tip="--include-untracked"/>
3132

3233
<CheckBox Grid.Row="2" Grid.Column="1"
3334
Height="32"
3435
Content="{DynamicResource Text.Stash.OnlyStagedChanges}"
3536
IsChecked="{Binding OnlyStaged, Mode=TwoWay}"
36-
IsVisible="{Binding !HasSelectedFiles}"/>
37+
IsVisible="{Binding !HasSelectedFiles}"
38+
ToolTip.Tip="--staged"/>
3739

3840
<CheckBox Grid.Row="3" Grid.Column="1"
3941
Height="32"
4042
Content="{DynamicResource Text.Stash.KeepIndex}"
41-
IsChecked="{Binding KeepIndex, Mode=TwoWay}"/>
43+
IsChecked="{Binding KeepIndex, Mode=TwoWay}"
44+
ToolTip.Tip="--keep-index"/>
4245

4346
<TextBlock Grid.Row="4" Grid.Column="1"
4447
Margin="0,4,0,0"

0 commit comments

Comments
 (0)