Skip to content

Commit 4dcfa35

Browse files
committed
ux: new branch tooltip style (#1693)
Signed-off-by: leo <[email protected]>
1 parent 2d3461a commit 4dcfa35

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-3
lines changed

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@
7070
<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">Reset ${0}$ to ${1}$...</x:String>
7171
<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Set Tracking Branch...</x:String>
7272
<x:String x:Key="Text.BranchCompare" xml:space="preserve">Branch Compare</x:String>
73+
<x:String x:Key="Text.BranchTree.InvalidUpstream" xml:space="preserve">Invalid</x:String>
7374
<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">REMOTE</x:String>
7475
<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">TRACKING</x:String>
7576
<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">URL</x:String>
76-
<x:String x:Key="Text.BranchUpstreamInvalid" xml:space="preserve">Invalid upstream!</x:String>
7777
<x:String x:Key="Text.Cancel" xml:space="preserve">CANCEL</x:String>
7878
<x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Reset to Parent Revision</x:String>
7979
<x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Reset to This Revision</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">重置 ${0}$ 到 ${1}$...</x:String>
7575
<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">切换上游分支 ...</x:String>
7676
<x:String x:Key="Text.BranchCompare" xml:space="preserve">分支比较</x:String>
77+
<x:String x:Key="Text.BranchTree.InvalidUpstream" xml:space="preserve">不存在</x:String>
7778
<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">远程</x:String>
7879
<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">上游分支</x:String>
7980
<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">远程地址</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@
7474
<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">重設 ${0}$ 至 ${1}$...</x:String>
7575
<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">切換上游分支...</x:String>
7676
<x:String x:Key="Text.BranchCompare" xml:space="preserve">分支比較</x:String>
77+
<x:String x:Key="Text.BranchTree.InvalidUpstream" xml:space="preserve">無效</x:String>
7778
<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">遠端</x:String>
7879
<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">上游分支</x:String>
7980
<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">遠端網址</x:String>

src/Views/BranchTree.axaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@
5858

5959
<TextBlock Margin="6,0,0,0"
6060
Text="{Binding Upstream, Mode=OneWay, Converter={x:Static c:StringConverters.ToFriendlyUpstream}}"/>
61+
62+
<Border Background="OrangeRed" Margin="4,0,0,0" CornerRadius="4" VerticalAlignment="Center" IsVisible="{Binding IsUpstreamGone}">
63+
<TextBlock Text="{DynamicResource Text.BranchTree.InvalidUpstream}" FontSize="12" Classes="primary" Margin="4,1" Foreground="White" VerticalAlignment="Center"/>
64+
</Border>
6165
</StackPanel>
6266
</StackPanel>
6367
</DataTemplate>
@@ -115,7 +119,6 @@
115119
Width="12" Height="12"
116120
Margin="8,0"
117121
Background="Transparent"
118-
ToolTip.Tip="{DynamicResource Text.BranchUpstreamInvalid}"
119122
IsVisible="{Binding ShowUpstreamGoneTip}">
120123
<Path Data="{StaticResource Icons.Error}" Fill="DarkOrange"/>
121124
</Border>

src/Views/FilterModeSwitchButton.axaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
Padding="0"
1212
Background="Transparent"
1313
VerticalContentAlignment="Center"
14-
Click="OnChangeFilterModeButtonClicked">
14+
Click="OnChangeFilterModeButtonClicked"
15+
ToolTip.Tip="{DynamicResource Text.Repository.FilterCommits}">
1516
<Grid>
1617
<Path Width="12" Height="12"
1718
Data="{StaticResource Icons.Eye}"

0 commit comments

Comments
 (0)