add tab keybindings

jesseduffield · Mar 23, 2020 · 5d460e1 · 5d460e1
1 parent 3d3e0be
commit 5d460e1
Show file tree

Hide file tree

Showing 5 changed files with 64 additions and 17 deletions.
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
@@ -16,6 +16,13 @@
   <kbd>:</kbd>: execute custom command
 </pre>
 
+## Branches Panel
+
+<pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
+</pre>
+
 ## Branches Panel (Branches Tab)
 
 <pre>
@@ -83,6 +90,8 @@
 ## Commits Panel
 
 <pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
   <kbd>/</kbd>: start search
 </pre>
 
@@ -110,6 +119,7 @@
   <kbd>space</kbd>: checkout commit
   <kbd>i</kbd>: select commit to diff with another commit
   <kbd>T</kbd>: tag commit
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
 </pre>
 
 ## Commits Panel (Reflog Tab)

diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
@@ -16,6 +16,13 @@
   <kbd>:</kbd>: voor aangepast commando uit
 </pre>
 
+## Branches Panel
+
+<pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
+</pre>
+
 ## Branches Panel (Branches Tab)
 
 <pre>
@@ -83,6 +90,8 @@
 ## Commits Panel
 
 <pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
   <kbd>/</kbd>: start search
 </pre>
 
@@ -110,6 +119,7 @@
   <kbd>space</kbd>: checkout commit
   <kbd>i</kbd>: select commit to diff with another commit
   <kbd>T</kbd>: tag commit
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
 </pre>
 
 ## Commits Panel (Reflog Tab)

diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
@@ -16,6 +16,13 @@
   <kbd>:</kbd>: execute custom command
 </pre>
 
+## Gałęzie Panel
+
+<pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
+</pre>
+
 ## Gałęzie Panel (Branches Tab)
 
 <pre>
@@ -83,6 +90,8 @@
 ## Commity Panel
 
 <pre>
+  <kbd>]</kbd>: next tab
+  <kbd>[</kbd>: previous tab
   <kbd>/</kbd>: start search
 </pre>
 
@@ -110,6 +119,7 @@
   <kbd>space</kbd>: checkout commit
   <kbd>i</kbd>: select commit to diff with another commit
   <kbd>T</kbd>: tag commit
+  <kbd>ctrl+r</kbd>: reset cherry-picked (copied) commits selection
 </pre>
 
 ## Commity Panel (Reflog Tab)

diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
@@ -618,16 +618,18 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Description: gui.Tr.SLocalize("viewResetOptions"),
 		},
 		{
-			ViewName: "branches",
-			Key:      gui.getKey("universal.nextTab"),
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleNextBranchesTab,
+			ViewName:    "branches",
+			Key:         gui.getKey("universal.nextTab"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleNextBranchesTab,
+			Description: gui.Tr.SLocalize("nextTab"),
 		},
 		{
-			ViewName: "branches",
-			Key:      gui.getKey("universal.prevTab"),
-			Modifier: gocui.ModNone,
-			Handler:  gui.handlePrevBranchesTab,
+			ViewName:    "branches",
+			Key:         gui.getKey("universal.prevTab"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handlePrevBranchesTab,
+			Description: gui.Tr.SLocalize("prevTab"),
 		},
 		{
 			ViewName:    "branches",
@@ -654,16 +656,18 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Description: gui.Tr.SLocalize("fetchRemote"),
 		},
 		{
-			ViewName: "commits",
-			Key:      gui.getKey("universal.nextTab"),
-			Modifier: gocui.ModNone,
-			Handler:  gui.handleNextCommitsTab,
+			ViewName:    "commits",
+			Key:         gui.getKey("universal.nextTab"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handleNextCommitsTab,
+			Description: gui.Tr.SLocalize("nextTab"),
 		},
 		{
-			ViewName: "commits",
-			Key:      gui.getKey("universal.prevTab"),
-			Modifier: gocui.ModNone,
-			Handler:  gui.handlePrevCommitsTab,
+			ViewName:    "commits",
+			Key:         gui.getKey("universal.prevTab"),
+			Modifier:    gocui.ModNone,
+			Handler:     gui.handlePrevCommitsTab,
+			Description: gui.Tr.SLocalize("prevTab"),
 		},
 		{
 			ViewName:    "commits",
@@ -1474,7 +1478,14 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 
 		// we need a specific keybinding for the commits panel beacuse it usually lazyloads commits
 		if listView.viewName != "commits" {
-			bindings = append(bindings, &Binding{ViewName: listView.viewName, Contexts: []string{listView.context}, Key: gui.getKey("universal.startSearch"), Modifier: gocui.ModNone, Handler: gui.handleOpenSearch, Description: gui.Tr.SLocalize("startSearch")})
+			bindings = append(bindings, &Binding{
+				ViewName:    listView.viewName,
+				Contexts:    []string{listView.context},
+				Key:         gui.getKey("universal.startSearch"),
+				Modifier:    gocui.ModNone,
+				Handler:     gui.handleOpenSearch,
+				Description: gui.Tr.SLocalize("startSearch"),
+			})
 		}
 	}
 

diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go
@@ -1035,6 +1035,12 @@ func addEnglish(i18nObject *i18n.Bundle) error {
 		}, &i18n.Message{
 			ID:    "resetCherryPick",
 			Other: "reset cherry-picked (copied) commits selection",
+		}, &i18n.Message{
+			ID:    "nextTab",
+			Other: "next tab",
+		}, &i18n.Message{
+			ID:    "prevTab",
+			Other: "previous tab",
 		},
 	)
 }