WIP

Author: 2KAbhishek

docs/Config.md

@@ -272,7 +272,7 @@ keybinding:
     bulkMenu: 'b'
   commitMessage:
     switchToEditor: '<c-o>'
-    addCoAuthor: '<c-e>'
+    commitMenu: '<c-e>'
   amendAttribute:
     addCoAuthor: 'c'
     resetAuthor: 'a'

pkg/config/user_config.go

@@ -441,7 +441,7 @@ type KeybindingSubmodulesConfig struct {
 
 type KeybindingCommitMessageConfig struct {
 	SwitchToEditor string `yaml:"switchToEditor"`
-	AddCoAuthor    string `yaml:"addCoAuthor"`
+	CommitMenu     string `yaml:"commitMenu"`
 }
 
 // OSConfig contains config on the level of the os
@@ -831,7 +831,7 @@ func GetDefaultConfig() *UserConfig {
 			},
 			CommitMessage: KeybindingCommitMessageConfig{
 				SwitchToEditor: "<c-o>",
-				AddCoAuthor:    "<c-e>",
+				CommitMenu:     "<c-e>",
 			},
 		},
 		OS:                           OSConfig{},

pkg/gui/context/commit_message_context.go

@@ -117,7 +117,7 @@ func (self *CommitMessageContext) SetPanelState(
 		map[string]string{
 			"togglePanelKeyBinding":    keybindings.Label(self.c.UserConfig.Keybinding.Universal.TogglePanel),
 			"switchToEditorKeyBinding": keybindings.Label(self.c.UserConfig.Keybinding.CommitMessage.SwitchToEditor),
-			"addCoAuthorKeyBinding":    keybindings.Label(self.c.UserConfig.Keybinding.CommitMessage.AddCoAuthor),
+			"commitMenuKeybinding":     keybindings.Label(self.c.UserConfig.Keybinding.CommitMessage.CommitMenu),
 		})
 }
 

pkg/gui/controllers/commit_description_controller.go

@@ -40,8 +40,8 @@ func (self *CommitDescriptionController) GetKeybindings(opts types.KeybindingsOp
 			Handler: self.switchToEditor,
 		},
 		{
-			Key:     opts.GetKey(opts.Config.CommitMessage.AddCoAuthor),
-			Handler: self.addCoAuthor,
+			Key:     opts.GetKey(opts.Config.CommitMessage.CommitMenu),
+			Handler: self.openCommitMenu,
 		},
 	}
 
@@ -72,6 +72,22 @@ func (self *CommitDescriptionController) switchToEditor() error {
 	return self.c.Helpers().Commits.SwitchToEditor()
 }
 
+func (self *CommitDescriptionController) openCommitMenu() error {
+	menuItems := []*types.MenuItem{
+		{
+			Label: self.c.Tr.AddCoAuthor,
+			OnPress: func() error {
+				return self.addCoAuthor()
+			},
+			Key: 'c',
+		},
+	}
+	return self.c.Menu(types.CreateMenuOptions{
+		Title: self.c.Tr.CommitMenuTitle,
+		Items: menuItems,
+	})
+}
+
 func (self *CommitDescriptionController) addCoAuthor() error {
 	return self.c.Prompt(types.PromptOpts{
 		Title:               self.c.Tr.AddCoAuthorPromptTitle,

pkg/gui/controllers/commit_message_controller.go

@@ -51,8 +51,8 @@ func (self *CommitMessageController) GetKeybindings(opts types.KeybindingsOpts)
 			Handler: self.switchToEditor,
 		},
 		{
-			Key:     opts.GetKey(opts.Config.CommitMessage.AddCoAuthor),
-			Handler: self.addCoAuthor,
+			Key:     opts.GetKey(opts.Config.CommitMessage.CommitMenu),
+			Handler: self.openCommitMenu,
 		},
 	}
 
@@ -96,6 +96,22 @@ func (self *CommitMessageController) switchToEditor() error {
 	return self.c.Helpers().Commits.SwitchToEditor()
 }
 
+func (self *CommitMessageController) openCommitMenu() error {
+	menuItems := []*types.MenuItem{
+		{
+			Label: self.c.Tr.AddCoAuthor,
+			OnPress: func() error {
+				return self.addCoAuthor()
+			},
+			Key: 'c',
+		},
+	}
+	return self.c.Menu(types.CreateMenuOptions{
+		Title: self.c.Tr.CommitMenuTitle,
+		Items: menuItems,
+	})
+}
+
 func (self *CommitMessageController) addCoAuthor() error {
 	return self.c.Prompt(types.PromptOpts{
 		Title:               self.c.Tr.AddCoAuthorPromptTitle,

pkg/i18n/english.go

@@ -208,6 +208,7 @@ type TranslationSet struct {
 	SearchTitle                         string
 	TagsTitle                           string
 	MenuTitle                           string
+	CommitMenuTitle                     string
 	RemotesTitle                        string
 	RemoteBranchesTitle                 string
 	PatchBuildingTitle                  string
@@ -1000,12 +1001,13 @@ func EnglishTranslationSet() TranslationSet {
 		RebaseOptionsTitle:                  "Rebase options",
 		CommitSummaryTitle:                  "Commit summary",
 		CommitDescriptionTitle:              "Commit description",
-		CommitDescriptionSubTitle:           "{{.togglePanelKeyBinding}} Toggle focus, {{.switchToEditorKeyBinding}} Open editor, {{.addCoAuthorKeyBinding}} Add author",
+		CommitDescriptionSubTitle:           "{{.togglePanelKeyBinding}} Toggle focus, {{.switchToEditorKeyBinding}} Open editor, {{.commitMenuKeybinding}} Menu",
 		CommitDescriptionSubTitleNoSwitch:   "Press {{.togglePanelKeyBinding}} to toggle focus",
 		LocalBranchesTitle:                  "Local branches",
 		SearchTitle:                         "Search",
 		TagsTitle:                           "Tags",
 		MenuTitle:                           "Menu",
+		CommitMenuTitle:                     "Commit Menu",
 		RemotesTitle:                        "Remotes",
 		RemoteBranchesTitle:                 "Remote branches",
 		PatchBuildingTitle:                  "Main panel (patch building)",