Skip to content

Commit 41416a6

Browse files
love-lingerlove-linger
committed
refactor: use DataTemplates instead of create NamedHighlightedTextBlock manually for menu item (#1216)
Signed-off-by: leo <[email protected]>
1 parent 5fd074a commit 41416a6

File tree

7 files changed

+69
-68
lines changed

7 files changed

+69
-68
lines changed

‎src/Resources/Styles.axaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,13 @@
838838
ContentTemplate="{TemplateBinding HeaderTemplate}"
839839
VerticalAlignment="Center"
840840
HorizontalAlignment="Stretch"
841-
RecognizesAccessKey="False"/>
841+
RecognizesAccessKey="False">
842+
<ContentPresenter.DataTemplates>
843+
<DataTemplate DataType="x:String">
844+
<v:NameHighlightedTextBlock Text="{Binding}" VerticalAlignment="Center"/>
845+
</DataTemplate>
846+
</ContentPresenter.DataTemplates>
847+
</ContentPresenter>
842848

843849
<TextBlock x:Name="PART_InputGestureText"
844850
Grid.Column="2"

‎src/ViewModels/DeleteBranch.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ public class DeleteBranch : Popup
77
public Models.Branch Target
88
{
99
get;
10-
private set;
1110
}
1211

1312
public Models.Branch TrackingRemoteBranch
1413
{
1514
get;
16-
private set;
1715
}
1816

19-
public object DeleteTrackingRemoteTip
17+
public string DeleteTrackingRemoteTip
2018
{
2119
get;
2220
private set;
@@ -37,7 +35,7 @@ public DeleteBranch(Repository repo, Models.Branch branch)
3735
{
3836
TrackingRemoteBranch = repo.Branches.Find(x => x.FullName == branch.Upstream);
3937
if (TrackingRemoteBranch != null)
40-
DeleteTrackingRemoteTip = new Views.NameHighlightedTextBlock("DeleteBranch.WithTrackingRemote", TrackingRemoteBranch.FriendlyName);
38+
DeleteTrackingRemoteTip = App.Text("DeleteBranch.WithTrackingRemote", TrackingRemoteBranch.FriendlyName);
4139
}
4240
}
4341

‎src/ViewModels/Histories.cs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public ContextMenu MakeContextMenu(ListBox list)
411411
if (current.Head != commit.SHA)
412412
{
413413
var reset = new MenuItem();
414-
reset.Header = new Views.NameHighlightedTextBlock("CommitCM.Reset", current.Name);
414+
reset.Header = App.Text("CommitCM.Reset", current.Name);
415415
reset.Icon = App.CreateMenuIcon("Icons.Reset");
416416
reset.Click += (_, e) =>
417417
{
@@ -476,7 +476,7 @@ public ContextMenu MakeContextMenu(ListBox list)
476476
if (!commit.IsMerged)
477477
{
478478
var rebase = new MenuItem();
479-
rebase.Header = new Views.NameHighlightedTextBlock("CommitCM.Rebase", current.Name);
479+
rebase.Header = App.Text("CommitCM.Rebase", current.Name);
480480
rebase.Icon = App.CreateMenuIcon("Icons.Rebase");
481481
rebase.Click += (_, e) =>
482482
{
@@ -489,7 +489,7 @@ public ContextMenu MakeContextMenu(ListBox list)
489489
if (!commit.HasDecorators)
490490
{
491491
var merge = new MenuItem();
492-
merge.Header = new Views.NameHighlightedTextBlock("CommitCM.Merge", current.Name);
492+
merge.Header = App.Text("CommitCM.Merge", current.Name);
493493
merge.Icon = App.CreateMenuIcon("Icons.Merge");
494494
merge.Click += (_, e) =>
495495
{
@@ -560,7 +560,7 @@ public ContextMenu MakeContextMenu(ListBox list)
560560
};
561561

562562
var interactiveRebase = new MenuItem();
563-
interactiveRebase.Header = new Views.NameHighlightedTextBlock("CommitCM.InteractiveRebase", current.Name);
563+
interactiveRebase.Header = App.Text("CommitCM.InteractiveRebase", current.Name);
564564
interactiveRebase.Icon = App.CreateMenuIcon("Icons.InteractiveRebase");
565565
interactiveRebase.Click += (_, e) =>
566566
{
@@ -897,7 +897,7 @@ private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current)
897897
var upstream = current.Upstream.Substring(13);
898898

899899
var fastForward = new MenuItem();
900-
fastForward.Header = new Views.NameHighlightedTextBlock("BranchCM.FastForward", upstream);
900+
fastForward.Header = App.Text("BranchCM.FastForward", upstream);
901901
fastForward.Icon = App.CreateMenuIcon("Icons.FastForward");
902902
fastForward.IsEnabled = current.TrackStatus.Ahead.Count == 0;
903903
fastForward.Click += (_, e) =>
@@ -914,7 +914,7 @@ private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current)
914914
submenu.Items.Add(fastForward);
915915

916916
var pull = new MenuItem();
917-
pull.Header = new Views.NameHighlightedTextBlock("BranchCM.Pull", upstream);
917+
pull.Header = App.Text("BranchCM.Pull", upstream);
918918
pull.Icon = App.CreateMenuIcon("Icons.Pull");
919919
pull.Click += (_, e) =>
920920
{
@@ -926,7 +926,7 @@ private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current)
926926
}
927927

928928
var push = new MenuItem();
929-
push.Header = new Views.NameHighlightedTextBlock("BranchCM.Push", current.Name);
929+
push.Header = App.Text("BranchCM.Push", current.Name);
930930
push.Icon = App.CreateMenuIcon("Icons.Push");
931931
push.IsEnabled = _repo.Remotes.Count > 0;
932932
push.Click += (_, e) =>
@@ -938,7 +938,7 @@ private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current)
938938
submenu.Items.Add(push);
939939

940940
var rename = new MenuItem();
941-
rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", current.Name);
941+
rename.Header = App.Text("BranchCM.Rename", current.Name);
942942
rename.Icon = App.CreateMenuIcon("Icons.Rename");
943943
rename.Click += (_, e) =>
944944
{
@@ -955,7 +955,7 @@ private void FillCurrentBranchMenu(ContextMenu menu, Models.Branch current)
955955
if (detect.IsGitFlowBranch)
956956
{
957957
var finish = new MenuItem();
958-
finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", current.Name);
958+
finish.Header = App.Text("BranchCM.Finish", current.Name);
959959
finish.Icon = App.CreateMenuIcon("Icons.GitFlow");
960960
finish.Click += (_, e) =>
961961
{
@@ -992,7 +992,7 @@ private void FillOtherLocalBranchMenu(ContextMenu menu, Models.Branch branch, Mo
992992
if (!_repo.IsBare)
993993
{
994994
var checkout = new MenuItem();
995-
checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", branch.Name);
995+
checkout.Header = App.Text("BranchCM.Checkout", branch.Name);
996996
checkout.Icon = App.CreateMenuIcon("Icons.Check");
997997
checkout.Click += (_, e) =>
998998
{
@@ -1002,7 +1002,7 @@ private void FillOtherLocalBranchMenu(ContextMenu menu, Models.Branch branch, Mo
10021002
submenu.Items.Add(checkout);
10031003

10041004
var merge = new MenuItem();
1005-
merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", branch.Name, current.Name);
1005+
merge.Header = App.Text("BranchCM.Merge", branch.Name, current.Name);
10061006
merge.Icon = App.CreateMenuIcon("Icons.Merge");
10071007
merge.IsEnabled = !merged;
10081008
merge.Click += (_, e) =>
@@ -1015,7 +1015,7 @@ private void FillOtherLocalBranchMenu(ContextMenu menu, Models.Branch branch, Mo
10151015
}
10161016

10171017
var rename = new MenuItem();
1018-
rename.Header = new Views.NameHighlightedTextBlock("BranchCM.Rename", branch.Name);
1018+
rename.Header = App.Text("BranchCM.Rename", branch.Name);
10191019
rename.Icon = App.CreateMenuIcon("Icons.Rename");
10201020
rename.Click += (_, e) =>
10211021
{
@@ -1026,7 +1026,7 @@ private void FillOtherLocalBranchMenu(ContextMenu menu, Models.Branch branch, Mo
10261026
submenu.Items.Add(rename);
10271027

10281028
var delete = new MenuItem();
1029-
delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", branch.Name);
1029+
delete.Header = App.Text("BranchCM.Delete", branch.Name);
10301030
delete.Icon = App.CreateMenuIcon("Icons.Clear");
10311031
delete.Click += (_, e) =>
10321032
{
@@ -1043,7 +1043,7 @@ private void FillOtherLocalBranchMenu(ContextMenu menu, Models.Branch branch, Mo
10431043
if (detect.IsGitFlowBranch)
10441044
{
10451045
var finish = new MenuItem();
1046-
finish.Header = new Views.NameHighlightedTextBlock("BranchCM.Finish", branch.Name);
1046+
finish.Header = App.Text("BranchCM.Finish", branch.Name);
10471047
finish.Icon = App.CreateMenuIcon("Icons.GitFlow");
10481048
finish.Click += (_, e) =>
10491049
{
@@ -1080,7 +1080,7 @@ private void FillRemoteBranchMenu(ContextMenu menu, Models.Branch branch, Models
10801080
FillBranchVisibilityMenu(submenu, branch);
10811081

10821082
var checkout = new MenuItem();
1083-
checkout.Header = new Views.NameHighlightedTextBlock("BranchCM.Checkout", name);
1083+
checkout.Header = App.Text("BranchCM.Checkout", name);
10841084
checkout.Icon = App.CreateMenuIcon("Icons.Check");
10851085
checkout.Click += (_, e) =>
10861086
{
@@ -1090,7 +1090,7 @@ private void FillRemoteBranchMenu(ContextMenu menu, Models.Branch branch, Models
10901090
submenu.Items.Add(checkout);
10911091

10921092
var merge = new MenuItem();
1093-
merge.Header = new Views.NameHighlightedTextBlock("BranchCM.Merge", name, current.Name);
1093+
merge.Header = App.Text("BranchCM.Merge", name, current.Name);
10941094
merge.Icon = App.CreateMenuIcon("Icons.Merge");
10951095
merge.IsEnabled = !merged;
10961096
merge.Click += (_, e) =>
@@ -1103,7 +1103,7 @@ private void FillRemoteBranchMenu(ContextMenu menu, Models.Branch branch, Models
11031103
submenu.Items.Add(merge);
11041104

11051105
var delete = new MenuItem();
1106-
delete.Header = new Views.NameHighlightedTextBlock("BranchCM.Delete", name);
1106+
delete.Header = App.Text("BranchCM.Delete", name);
11071107
delete.Icon = App.CreateMenuIcon("Icons.Clear");
11081108
delete.Click += (_, e) =>
11091109
{
@@ -1137,7 +1137,7 @@ private void FillTagMenu(ContextMenu menu, Models.Tag tag, Models.Branch current
11371137
FillTagVisibilityMenu(submenu, tag);
11381138

11391139
var push = new MenuItem();
1140-
push.Header = new Views.NameHighlightedTextBlock("TagCM.Push", tag.Name);
1140+
push.Header = App.Text("TagCM.Push", tag.Name);
11411141
push.Icon = App.CreateMenuIcon("Icons.Push");
11421142
push.IsEnabled = _repo.Remotes.Count > 0;
11431143
push.Click += (_, e) =>
@@ -1151,7 +1151,7 @@ private void FillTagMenu(ContextMenu menu, Models.Tag tag, Models.Branch current
11511151
if (!_repo.IsBare && !merged)
11521152
{
11531153
var merge = new MenuItem();
1154-
merge.Header = new Views.NameHighlightedTextBlock("TagCM.Merge", tag.Name, current.Name);
1154+
merge.Header = App.Text("TagCM.Merge", tag.Name, current.Name);
11551155
merge.Icon = App.CreateMenuIcon("Icons.Merge");
11561156
merge.Click += (_, e) =>
11571157
{
@@ -1163,7 +1163,7 @@ private void FillTagMenu(ContextMenu menu, Models.Tag tag, Models.Branch current
11631163
}
11641164

11651165
var delete = new MenuItem();
1166-
delete.Header = new Views.NameHighlightedTextBlock("TagCM.Delete", tag.Name);
1166+
delete.Header = App.Text("TagCM.Delete", tag.Name);
11671167
delete.Icon = App.CreateMenuIcon("Icons.Clear");
11681168
delete.Click += (_, e) =>
11691169
{

0 commit comments

Comments
 (0)