Commit 4dcfa35

committed

ux: new branch tooltip style (#1693)

Signed-off-by: leo <longshuang@msn.cn>

1 parent 2d3461a commit 4dcfa35Copy full SHA for 4dcfa35

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,10 @@`
`70`	`70`	`<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">Reset ${0}$ to ${1}$...</x:String>`
`71`	`71`	`<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Set Tracking Branch...</x:String>`
`72`	`72`	`<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>`
`73`	`74`	`<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">REMOTE</x:String>`
`74`	`75`	`<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">TRACKING</x:String>`
`75`	`76`	`<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>`
`77`	`77`	`<x:String x:Key="Text.Cancel" xml:space="preserve">CANCEL</x:String>`
`78`	`78`	`<x:String x:Key="Text.ChangeCM.CheckoutFirstParentRevision" xml:space="preserve">Reset to Parent Revision</x:String>`
`79`	`79`	`<x:String x:Key="Text.ChangeCM.CheckoutThisRevision" xml:space="preserve">Reset to This Revision</x:String>`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@`
`74`	`74`	`<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">重置 ${0}$ 到 ${1}$...</x:String>`
`75`	`75`	`<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">切换上游分支 ...</x:String>`
`76`	`76`	`<x:String x:Key="Text.BranchCompare" xml:space="preserve">分支比较</x:String>`
	`77`	`+ <x:String x:Key="Text.BranchTree.InvalidUpstream" xml:space="preserve">不存在</x:String>`
`77`	`78`	`<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">远程</x:String>`
`78`	`79`	`<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">上游分支</x:String>`
`79`	`80`	`<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">远程地址</x:String>`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@`
`74`	`74`	`<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">重設 ${0}$ 至 ${1}$...</x:String>`
`75`	`75`	`<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">切換上游分支...</x:String>`
`76`	`76`	`<x:String x:Key="Text.BranchCompare" xml:space="preserve">分支比較</x:String>`
	`77`	`+ <x:String x:Key="Text.BranchTree.InvalidUpstream" xml:space="preserve">無效</x:String>`
`77`	`78`	`<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">遠端</x:String>`
`78`	`79`	`<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">上游分支</x:String>`
`79`	`80`	`<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">遠端網址</x:String>`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,10 @@`
`58`	`58`
`59`	`59`	`<TextBlock Margin="6,0,0,0"`
`60`	`60`	`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>`
`61`	`65`	`</StackPanel>`
`62`	`66`	`</StackPanel>`
`63`	`67`	`</DataTemplate>`
`@@ -115,7 +119,6 @@`
`115`	`119`	`Width="12" Height="12"`
`116`	`120`	`Margin="8,0"`
`117`	`121`	`Background="Transparent"`
`118`		`- ToolTip.Tip="{DynamicResource Text.BranchUpstreamInvalid}"`
`119`	`122`	`IsVisible="{Binding ShowUpstreamGoneTip}">`
`120`	`123`	`<Path Data="{StaticResource Icons.Error}" Fill="DarkOrange"/>`
`121`	`124`	`</Border>`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@`
`11`	`11`	`Padding="0"`
`12`	`12`	`Background="Transparent"`
`13`	`13`	`VerticalContentAlignment="Center"`
`14`		`- Click="OnChangeFilterModeButtonClicked">`
	`14`	`+ Click="OnChangeFilterModeButtonClicked"`
	`15`	`+ ToolTip.Tip="{DynamicResource Text.Repository.FilterCommits}">`
`15`	`16`	`<Grid>`
`16`	`17`	`<Path Width="12" Height="12"`
`17`	`18`	`Data="{StaticResource Icons.Eye}"`

Comments

(0)