Commit 75e9f1e

committed

feature: show track status in Delete Multiple Branches panel (#785)

1 parent 1ddd348 commit 75e9f1eCopy full SHA for 75e9f1e

File tree

+18

-10

lines changed

+18

-10

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ public class BranchTrackStatus`
`7`	`7`	`public List<string> Ahead { get; set; } = new List<string>();`
`8`	`8`	`public List<string> Behind { get; set; } = new List<string>();`
`9`	`9`
	`10`	`+ public bool IsVisible => Ahead.Count > 0 \|\| Behind.Count > 0;`
	`11`	`+`
`10`	`12`	`public override string ToString()`
`11`	`13`	`{`
`12`	`14`	`if (Ahead.Count == 0 && Behind.Count == 0)`

Lines changed: 0 additions & 7 deletions

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

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@`
`22`	`22`	`VerticalAlignment="Center"`
`23`	`23`	`CornerRadius="9"`
`24`	`24`	`Background="{DynamicResource Brush.Badge}"`
`25`		`- IsVisible="{Binding TrackStatus, Converter={x:Static StringConverters.IsNotNullOrEmpty}}">`
	`25`	`+ IsVisible="{Binding Target.TrackStatus.IsVisible}">`
`26`	`26`	`<TextBlock Foreground="{DynamicResource Brush.BadgeFG}"`
`27`	`27`	`FontFamily="{DynamicResource Fonts.Monospace}"`
`28`	`28`	`FontSize="10"`
`29`		`- Text="{Binding TrackStatus}"/>`
	`29`	`+ Text="{Binding Target.TrackStatus}"/>`
`30`	`30`	`</Border>`
`31`	`31`	`</StackPanel>`
`32`	`32`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,22 @@`
`42`	`42`
`43`	`43`	`<ListBox.ItemTemplate>`
`44`	`44`	`<DataTemplate DataType="m:Branch">`
`45`		`- <Grid Height="26" ColumnDefinitions="22,*">`
	`45`	`+ <Grid Height="26" ColumnDefinitions="22,*,Auto">`
`46`	`46`	`<Path Grid.Column="0" Width="10" Height="10" Margin="4,0,8,0" Data="{StaticResource Icons.Branch}" />`
`47`	`47`	`<TextBlock Grid.Column="1" Text="{Binding FriendlyName}" Classes="primary" />`
	`48`	`+ <Border Grid.Column="2"`
	`49`	`+ Height="18"`
	`50`	`+ Margin="8,0"`
	`51`	`+ Padding="8,0"`
	`52`	`+ VerticalAlignment="Center"`
	`53`	`+ CornerRadius="9"`
	`54`	`+ Background="{DynamicResource Brush.Badge}"`
	`55`	`+ IsVisible="{Binding TrackStatus.IsVisible}">`
	`56`	`+ <TextBlock Foreground="{DynamicResource Brush.BadgeFG}"`
	`57`	`+ FontFamily="{DynamicResource Fonts.Monospace}"`
	`58`	`+ FontSize="10"`
	`59`	`+ Text="{Binding TrackStatus}"/>`
	`60`	`+ </Border>`
`48`	`61`	`</Grid>`
`49`	`62`	`</DataTemplate>`
`50`	`63`	`</ListBox.ItemTemplate>`

Comments

(0)