Skip to content

Commit af7e68b

Browse files
committed
ux: use the same tooltip style for submodule when displaying as tree
Signed-off-by: leo <[email protected]>
1 parent f6b0f14 commit af7e68b

File tree

4 files changed

+23
-20
lines changed

4 files changed

+23
-20
lines changed

src/Commands/QuerySubmodules.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ private class ModuleInfo
157157
{
158158
public string Path { get; set; } = string.Empty;
159159
public string URL { get; set; } = string.Empty;
160-
public string Branch { get; set; } = string.Empty;
160+
public string Branch { get; set; } = "HEAD";
161161
}
162162
}
163163
}

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,7 +733,7 @@
733733
<x:String x:Key="Text.Statistics.TotalCommits" xml:space="preserve">COMMITS: </x:String>
734734
<x:String x:Key="Text.Submodule" xml:space="preserve">SUBMODULES</x:String>
735735
<x:String x:Key="Text.Submodule.Add" xml:space="preserve">Add Submodule</x:String>
736-
<x:String x:Key="Text.Submodule.Branch" xml:space="preserve">Branch</x:String>
736+
<x:String x:Key="Text.Submodule.Branch" xml:space="preserve">BRANCH</x:String>
737737
<x:String x:Key="Text.Submodule.CopyPath" xml:space="preserve">Relative Path</x:String>
738738
<x:String x:Key="Text.Submodule.Deinit" xml:space="preserve">De-initialize</x:String>
739739
<x:String x:Key="Text.Submodule.FetchNested" xml:space="preserve">Fetch nested submodules</x:String>

src/Views/SetSubmoduleBranch.axaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@
2626
Text="{DynamicResource Text.SetSubmoduleBranch.Current}"/>
2727
<StackPanel Grid.Row="1" Grid.Column="1" Orientation="Horizontal">
2828
<Path Width="14" Height="14" Data="{StaticResource Icons.Branch}"/>
29-
<TextBlock Margin="6,0,0,0"
30-
Text="{Binding Submodule.Branch, Mode=OneWay}"
31-
IsVisible="{Binding Submodule.Branch, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
32-
<TextBlock Margin="6,0,0,0"
33-
Text="--"
34-
IsVisible="{Binding Submodule.Branch, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
29+
<TextBlock Margin="6,0,0,0" Text="{Binding Submodule.Branch, Mode=OneWay}"/>
3530
</StackPanel>
3631

3732
<TextBlock Grid.Row="2" Grid.Column="0"

src/Views/SubmodulesView.axaml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,29 @@
2525
<TextBlock FontWeight="Bold" Margin="4,0,0,0" Text="{Binding Path}"/>
2626
</StackPanel>
2727

28-
<Grid RowDefinitions="24,24" ColumnDefinitions="Auto,Auto" Margin="0,8,0,0">
28+
<Grid RowDefinitions="24,24,24" ColumnDefinitions="Auto,Auto" Margin="0,8,0,0">
2929
<TextBlock Grid.Row="0" Grid.Column="0"
30+
Classes="info_label"
31+
HorizontalAlignment="Left" VerticalAlignment="Center"
32+
Text="{DynamicResource Text.Submodule.Branch}"/>
33+
<StackPanel Grid.Row="0" Grid.Column="1"
34+
Orientation="Horizontal"
35+
Margin="8,0,0,0">
36+
<Path Width="14" Height="14" Margin="2,0,0,0" Data="{StaticResource Icons.Branch}"/>
37+
<TextBlock Margin="6,0,0,0" Text="{Binding Branch, Mode=OneWay}"/>
38+
</StackPanel>
39+
40+
<TextBlock Grid.Row="1" Grid.Column="0"
3041
Classes="info_label"
3142
HorizontalAlignment="Left" VerticalAlignment="Center"
3243
Text="{DynamicResource Text.CommitDetail.Info.SHA}"/>
33-
<StackPanel Grid.Row="0" Grid.Column="1"
44+
<StackPanel Grid.Row="1" Grid.Column="1"
3445
Orientation="Horizontal"
3546
Margin="8,0,0,0">
36-
<TextBlock Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
47+
<Path Width="14" Height="14" Data="{StaticResource Icons.Commit}"/>
48+
49+
<TextBlock Margin="8,0,0,0"
50+
Text="{Binding SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
3751
VerticalAlignment="Center"/>
3852

3953
<Path Margin="6,0,0,0"
@@ -69,11 +83,11 @@
6983
</Border>
7084
</StackPanel>
7185

72-
<TextBlock Grid.Row="1" Grid.Column="0"
86+
<TextBlock Grid.Row="2" Grid.Column="0"
7387
Classes="info_label"
7488
HorizontalAlignment="Left" VerticalAlignment="Center"
7589
Text="{DynamicResource Text.Submodule.URL}"/>
76-
<TextBlock Grid.Row="1" Grid.Column="1"
90+
<TextBlock Grid.Row="2" Grid.Column="1"
7791
Margin="8,0,0,0"
7892
Text="{Binding URL}"
7993
Foreground="{DynamicResource Brush.Link}"
@@ -156,13 +170,7 @@
156170
Orientation="Horizontal"
157171
Margin="8,0,0,0">
158172
<Path Width="14" Height="14" Margin="2,0,0,0" Data="{StaticResource Icons.Branch}"/>
159-
160-
<TextBlock Margin="6,0,0,0"
161-
Text="{Binding Branch, Mode=OneWay}"
162-
IsVisible="{Binding Branch, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"/>
163-
<TextBlock Margin="6,0,0,0"
164-
Text="--"
165-
IsVisible="{Binding Branch, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
173+
<TextBlock Margin="6,0,0,0" Text="{Binding Branch, Mode=OneWay}"/>
166174
</StackPanel>
167175

168176
<TextBlock Grid.Row="1" Grid.Column="0"

0 commit comments

Comments
 (0)