Commit 1ddd348

committed

feature: show tracking status in Delete Branch panel if possible (#785)

1 parent d616d08 commit 1ddd348Copy full SHA for 1ddd348

File tree

+19

-0

lines changed

+19

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,12 @@ public Models.Branch Target`
`10`	`10`	`private set;`
`11`	`11`	`}`
`12`	`12`
	`13`	`+ public string TrackStatus`
	`14`	`+ {`
	`15`	`+ get;`
	`16`	`+ private set;`
	`17`	`+ }`
	`18`	`+`
`13`	`19`	`public Models.Branch TrackingRemoteBranch`
`14`	`20`	`{`
`15`	`21`	`get;`
`@@ -32,6 +38,7 @@ public DeleteBranch(Repository repo, Models.Branch branch)`
`32`	`38`	`{`
`33`	`39`	`_repo = repo;`
`34`	`40`	`Target = branch;`
	`41`	`+ TrackStatus = branch.TrackStatus.ToString();`
`35`	`42`
`36`	`43`	`if (branch.IsLocal && !string.IsNullOrEmpty(branch.Upstream))`
`37`	`44`	`{`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,18 @@`
`16`	`16`	`<StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">`
`17`	`17`	`<Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>`
`18`	`18`	`<TextBlock Text="{Binding Target.FriendlyName}"/>`
	`19`	`+ <Border Height="18"`
	`20`	`+ Margin="8,0,0,0"`
	`21`	`+ Padding="8,0"`
	`22`	`+ VerticalAlignment="Center"`
	`23`	`+ CornerRadius="9"`
	`24`	`+ Background="{DynamicResource Brush.Badge}"`
	`25`	`+ IsVisible="{Binding TrackStatus, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">`
	`26`	`+ <TextBlock Foreground="{DynamicResource Brush.BadgeFG}"`
	`27`	`+ FontFamily="{DynamicResource Fonts.Monospace}"`
	`28`	`+ FontSize="10"`
	`29`	`+ Text="{Binding TrackStatus}"/>`
	`30`	`+ </Border>`
`19`	`31`	`</StackPanel>`
`20`	`32`
`21`	`33`	`<Border Grid.Row="1" Grid.Column="1" Height="32" IsVisible="{Binding !Target.IsLocal}">`

Comments

(0)