diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-08 16:54:54 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2018-12-11 22:02:12 +1100 |
| commit | 9489a9447396b30bca86ea3df201cacfdffdb1a9 (patch) | |
| tree | ae251c28096f2bde6b1647603852782c58329d4c /pkg/gui/keybindings.go | |
| parent | e0ff46fe53503d74fc63c90fc5ddc4d9468b60d5 (diff) | |
Make merge panel its own panel
Diffstat (limited to 'pkg/gui/keybindings.go')
| -rw-r--r-- | pkg/gui/keybindings.go | 58 |
1 files changed, 28 insertions, 30 deletions
diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go index 745e2fa7f..410d4545c 100644 --- a/pkg/gui/keybindings.go +++ b/pkg/gui/keybindings.go @@ -153,11 +153,11 @@ func (gui *Gui) GetKeybindings() []*Binding { Handler: gui.handleFileRemove, Description: gui.Tr.SLocalize("removeFile"), }, { - ViewName: "files", + ViewName: "files", // TODO: might make this for more views as well Key: 'm', Modifier: gocui.ModNone, - Handler: gui.handleSwitchToMerge, - Description: gui.Tr.SLocalize("resolveMergeConflicts"), + Handler: gui.handleCreateRebaseOptionsMenu, + Description: gui.Tr.SLocalize("ViewMergeRebaseOptions"), }, { ViewName: "files", Key: 'e', @@ -190,12 +190,6 @@ func (gui *Gui) GetKeybindings() []*Binding { Description: gui.Tr.SLocalize("stashFiles"), }, { ViewName: "files", - Key: 'M', - Modifier: gocui.ModNone, - Handler: gui.handleAbortMerge, - Description: gui.Tr.SLocalize("abortMerge"), - }, { - ViewName: "files", Key: 'a', Modifier: gocui.ModNone, Handler: gui.handleStageAll, @@ -220,65 +214,69 @@ func (gui *Gui) GetKeybindings() []*Binding { Description: gui.Tr.SLocalize("StageLines"), KeyReadable: "enter", }, { - ViewName: "main", + ViewName: "merging", Key: gocui.KeyEsc, Modifier: gocui.ModNone, Handler: gui.handleEscapeMerge, }, { - ViewName: "main", - Key: gocui.KeySpace, - Modifier: gocui.ModNone, - Handler: gui.handlePickHunk, + ViewName: "merging", + Key: gocui.KeySpace, + Modifier: gocui.ModNone, + Handler: gui.handlePickHunk, + Description: gui.Tr.SLocalize("PickHunk"), + KeyReadable: "space", }, { - ViewName: "main", - Key: 'b', - Modifier: gocui.ModNone, - Handler: gui.handlePickBothHunks, + ViewName: "merging", + Key: 'b', + Modifier: gocui.ModNone, + Handler: gui.handlePickBothHunks, + Description: gui.Tr.SLocalize("PickBothHunks"), }, { - ViewName: "main", + ViewName: "merging", Key: gocui.KeyArrowLeft, Modifier: gocui.ModNone, Handler: gui.handleSelectPrevConflict, }, { - ViewName: "main", + ViewName: "merging", Key: gocui.KeyArrowRight, Modifier: gocui.ModNone, Handler: gui.handleSelectNextConflict, }, { - ViewName: "main", + ViewName: "merging", Key: gocui.KeyArrowUp, Modifier: gocui.ModNone, Handler: gui.handleSelectTop, }, { - ViewName: "main", + ViewName: "merging", Key: gocui.KeyArrowDown, Modifier: gocui.ModNone, Handler: gui.handleSelectBottom, }, { - ViewName: "main", + ViewName: "merging", Key: 'h', Modifier: gocui.ModNone, Handler: gui.handleSelectPrevConflict, }, { - ViewName: "main", + ViewName: "merging", Key: 'l', Modifier: gocui.ModNone, Handler: gui.handleSelectNextConflict, }, { - ViewName: "main", + ViewName: "merging", Key: 'k', Modifier: gocui.ModNone, Handler: gui.handleSelectTop, }, { - ViewName: "main", + ViewName: "merging", Key: 'j', Modifier: gocui.ModNone, Handler: gui.handleSelectBottom, }, { - ViewName: "main", - Key: 'z', - Modifier: gocui.ModNone, - Handler: gui.handlePopFileSnapshot, + ViewName: "merging", + Key: 'z', + Modifier: gocui.ModNone, + Handler: gui.handlePopFileSnapshot, + Description: gui.Tr.SLocalize("Undo"), }, { ViewName: "branches", Key: gocui.KeySpace, |