summaryrefslogtreecommitdiffstats
path: root/pkg/gui/controllers/helpers
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2022-05-08 14:23:32 +1000
committerJesse Duffield <jessedduffield@gmail.com>2022-05-08 14:26:18 +1000
commit6f8063217ddf132dca36b75affaa7f7273f89d9d (patch)
tree871c1b76adf464b11fe04c43bbd2a4a7ac5d452e /pkg/gui/controllers/helpers
parent125e948d82c33226f92a1ebe18361633116370d3 (diff)
rename displayString to label for menu items
Diffstat (limited to 'pkg/gui/controllers/helpers')
-rw-r--r--pkg/gui/controllers/helpers/merge_and_rebase_helper.go2
-rw-r--r--pkg/gui/controllers/helpers/refs_helper.go2
-rw-r--r--pkg/gui/controllers/helpers/tags_helper.go4
3 files changed, 4 insertions, 4 deletions
diff --git a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
index 4484e4fc8..ef9dd76a2 100644
--- a/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
+++ b/pkg/gui/controllers/helpers/merge_and_rebase_helper.go
@@ -64,7 +64,7 @@ func (self *MergeAndRebaseHelper) CreateRebaseOptionsMenu() error {
menuItems := slices.Map(options, func(row optionAndKey) *types.MenuItem {
return &types.MenuItem{
- DisplayString: row.option,
+ Label: row.option,
OnPress: func() error {
return self.genericMergeCommand(row.option)
},
diff --git a/pkg/gui/controllers/helpers/refs_helper.go b/pkg/gui/controllers/helpers/refs_helper.go
index d96fa795b..7630349ec 100644
--- a/pkg/gui/controllers/helpers/refs_helper.go
+++ b/pkg/gui/controllers/helpers/refs_helper.go
@@ -146,7 +146,7 @@ func (self *RefsHelper) CreateGitResetMenu(ref string) error {
menuItems := slices.Map(strengths, func(row strengthWithKey) *types.MenuItem {
return &types.MenuItem{
- DisplayStrings: []string{
+ LabelColumns: []string{
fmt.Sprintf("%s reset", row.strength),
style.FgRed.Sprintf("reset --%s %s", row.strength, ref),
},
diff --git a/pkg/gui/controllers/helpers/tags_helper.go b/pkg/gui/controllers/helpers/tags_helper.go
index d2e92cd24..4683ffd0d 100644
--- a/pkg/gui/controllers/helpers/tags_helper.go
+++ b/pkg/gui/controllers/helpers/tags_helper.go
@@ -26,13 +26,13 @@ func (self *TagsHelper) CreateTagMenu(commitSha string, onCreate func()) error {
Title: self.c.Tr.TagMenuTitle,
Items: []*types.MenuItem{
{
- DisplayString: self.c.Tr.LcLightweightTag,
+ Label: self.c.Tr.LcLightweightTag,
OnPress: func() error {
return self.handleCreateLightweightTag(commitSha, onCreate)
},
},
{
- DisplayString: self.c.Tr.LcAnnotatedTag,
+ Label: self.c.Tr.LcAnnotatedTag,
OnPress: func() error {
return self.handleCreateAnnotatedTag(commitSha, onCreate)
},