mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-06-20 01:19:23 +02:00
Fold remaining alt bindings into their main fields
Convert the remaining *Alt/*Alt[12] sibling fields (PrevItem/NextItem, GotoTop/GotoBottom, PrevBlock/NextBlock, ScrollUpMain/ScrollDownMain, OptionMenu, ConfirmInEditor, DiffingMenu) so the merge mechanism folds their values into the corresponding main multi-key binding at config load. The redundant alt-only Binding registrations across the various controllers and the global keybindings file are gone: the merged main field already carries every key, so the for-loop in SetKeybinding registers them all.
This commit is contained in:
Stefan Haller
+10
-24
@@ -602,27 +602,19 @@ keybinding:
|
||||
return: <esc>
|
||||
quitWithoutChangingDirectory: Q
|
||||
togglePanel: <tab>
|
||||
prevItem: <up>
|
||||
nextItem: <down>
|
||||
prevItem-alt: k
|
||||
nextItem-alt: j
|
||||
prevItem: [<up>, k]
|
||||
nextItem: [<down>, j]
|
||||
prevPage: ','
|
||||
nextPage: .
|
||||
scrollLeft: H
|
||||
scrollRight: L
|
||||
gotoTop: <
|
||||
gotoBottom: '>'
|
||||
gotoTop-alt: <home>
|
||||
gotoBottom-alt: <end>
|
||||
gotoTop: [<, <home>]
|
||||
gotoBottom: ['>', <end>]
|
||||
toggleRangeSelect: v
|
||||
rangeSelectDown: <shift+down>
|
||||
rangeSelectUp: <shift+up>
|
||||
prevBlock: <left>
|
||||
nextBlock: <right>
|
||||
prevBlock-alt: h
|
||||
nextBlock-alt: l
|
||||
nextBlock-alt2: <tab>
|
||||
prevBlock-alt2: <backtab>
|
||||
prevBlock: [<left>, h, <backtab>]
|
||||
nextBlock: [<right>, l, <tab>]
|
||||
jumpToBlock:
|
||||
- "1"
|
||||
- "2"
|
||||
@@ -653,18 +645,13 @@ keybinding:
|
||||
confirmSuggestion: <enter>
|
||||
|
||||
# <meta+enter> on Mac
|
||||
confirmInEditor: <ctrl+enter>
|
||||
confirmInEditor-alt: <ctrl+s>
|
||||
confirmInEditor: [<ctrl+enter>, <ctrl+s>]
|
||||
remove: d
|
||||
new: "n"
|
||||
edit: e
|
||||
openFile: o
|
||||
scrollUpMain: <pgup>
|
||||
scrollDownMain: <pgdown>
|
||||
scrollUpMain-alt1: K
|
||||
scrollDownMain-alt1: J
|
||||
scrollUpMain-alt2: <ctrl+u>
|
||||
scrollDownMain-alt2: <ctrl+d>
|
||||
scrollUpMain: [<pgup>, K, <ctrl+u>]
|
||||
scrollDownMain: [<pgdown>, J, <ctrl+d>]
|
||||
executeShellCommand: ':'
|
||||
createRebaseOptionsMenu: m
|
||||
|
||||
@@ -683,8 +670,7 @@ keybinding:
|
||||
undo: z
|
||||
redo: Z
|
||||
filteringMenu: <ctrl+s>
|
||||
diffingMenu: W
|
||||
diffingMenu-alt: <ctrl+e>
|
||||
diffingMenu: [W, <ctrl+e>]
|
||||
copyToClipboard: <ctrl+o>
|
||||
openRecentRepos: <ctrl+r>
|
||||
submitEditorText: <enter>
|
||||
|
||||
@@ -7,8 +7,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| Key | Action | Info |
|
||||
|-----|--------|-------------|
|
||||
| `` <ctrl+r> `` | Switch to a recent repo | |
|
||||
| `` <pgup> (fn+up/shift+k) `` | Scroll up main window | |
|
||||
| `` <pgdown> (fn+down/shift+j) `` | Scroll down main window | |
|
||||
| `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | Scroll up main window | |
|
||||
| `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | Scroll down main window | |
|
||||
| `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
|
||||
| `` P `` | Push | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
|
||||
| `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
|
||||
@@ -26,8 +26,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| `` <esc> `` | Cancel | |
|
||||
| `` ? `` | Open keybindings menu | |
|
||||
| `` <ctrl+s> `` | View filter options | View options for filtering the commit log, so that only commits matching the filter are shown. |
|
||||
| `` W `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` <ctrl+e> `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` W, <ctrl+e> `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` q, <ctrl+c> `` | Quit | |
|
||||
| `` <ctrl+z> `` | Suspend the application | |
|
||||
| `` <ctrl+w> `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
|
||||
@@ -40,8 +39,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` , `` | Previous page | |
|
||||
| `` . `` | Next page | |
|
||||
| `` < (<home>) `` | Scroll to top | |
|
||||
| `` > (<end>) `` | Scroll to bottom | |
|
||||
| `` <, <home> `` | Scroll to top | |
|
||||
| `` >, <end> `` | Scroll to bottom | |
|
||||
| `` v `` | Toggle range select | |
|
||||
| `` <shift+down> `` | Range select down | |
|
||||
| `` <shift+up> `` | Range select up | |
|
||||
@@ -205,8 +204,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` <space> `` | Pick hunk | |
|
||||
| `` b `` | Pick all hunks | |
|
||||
| `` <up> `` | Previous hunk | |
|
||||
| `` <down> `` | Next hunk | |
|
||||
| `` <up>, k `` | Previous hunk | |
|
||||
| `` <down>, j `` | Next hunk | |
|
||||
| `` <left>, h `` | Previous conflict | |
|
||||
| `` <right>, l `` | Next conflict | |
|
||||
| `` z `` | Undo | Undo last merge conflict resolution. |
|
||||
|
||||
@@ -7,8 +7,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| Key | Action | Info |
|
||||
|-----|--------|-------------|
|
||||
| `` <ctrl+r> `` | 最近のリポジトリをチェックアウト | |
|
||||
| `` <pgup> (fn+up/shift+k) `` | メインウィンドウを上にスクロール | |
|
||||
| `` <pgdown> (fn+down/shift+j) `` | メインウィンドウを下にスクロール | |
|
||||
| `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | メインウィンドウを上にスクロール | |
|
||||
| `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | メインウィンドウを下にスクロール | |
|
||||
| `` @ `` | コマンドログオプションを表示 | コマンドログのオプションを表示します（例：コマンドログの表示/非表示、コマンドログへのフォーカスなど）。 |
|
||||
| `` P `` | プッシュ | 現在のブランチを対応するアップストリームブランチにプッシュします。アップストリームが設定されていない場合、アップストリームブランチの設定を求められます。 |
|
||||
| `` p `` | プル | 現在のブランチのリモートから変更をプルします。アップストリームが設定されていない場合、アップストリームブランチの設定を求められます。 |
|
||||
@@ -26,8 +26,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| `` <esc> `` | キャンセル | |
|
||||
| `` ? `` | キーバインディングメニューを開く | |
|
||||
| `` <ctrl+s> `` | フィルターオプションを表示 | コミットログのフィルタリングオプションを表示し、フィルタに一致するコミットのみを表示します。 |
|
||||
| `` W `` | 差分オプションを表示 | ２つのrefの差分に関連するオプションを表示します（例：選択したrefとの差分表示、差分を取るrefの入力、差分方向の反転など）。 |
|
||||
| `` <ctrl+e> `` | 差分オプションを表示 | ２つのrefの差分に関連するオプションを表示します（例：選択したrefとの差分表示、差分を取るrefの入力、差分方向の反転など）。 |
|
||||
| `` W, <ctrl+e> `` | 差分オプションを表示 | ２つのrefの差分に関連するオプションを表示します（例：選択したrefとの差分表示、差分を取るrefの入力、差分方向の反転など）。 |
|
||||
| `` q, <ctrl+c> `` | 終了 | |
|
||||
| `` <ctrl+z> `` | Suspend the application | |
|
||||
| `` <ctrl+w> `` | 空白表示の切り替え | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
|
||||
@@ -40,8 +39,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` , `` | 前のページ | |
|
||||
| `` . `` | 次のページ | |
|
||||
| `` < (<home>) `` | 先頭にスクロール | |
|
||||
| `` > (<end>) `` | 末尾にスクロール | |
|
||||
| `` <, <home> `` | 先頭にスクロール | |
|
||||
| `` >, <end> `` | 末尾にスクロール | |
|
||||
| `` v `` | 範囲選択を切り替え | |
|
||||
| `` <shift+down> `` | 範囲選択を下に | |
|
||||
| `` <shift+up> `` | 範囲選択を上に | |
|
||||
@@ -288,8 +287,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` <space> `` | ハンクを選択 | |
|
||||
| `` b `` | すべてのハンクを選択 | |
|
||||
| `` <up> `` | 前のハンク | |
|
||||
| `` <down> `` | 次のハンク | |
|
||||
| `` <up>, k `` | 前のハンク | |
|
||||
| `` <down>, j `` | 次のハンク | |
|
||||
| `` <left>, h `` | 前のコンフリクト | |
|
||||
| `` <right>, l `` | 次のコンフリクト | |
|
||||
| `` z `` | 元に戻す | 最後のマージコンフリクト解決を元に戻します。 |
|
||||
|
||||
@@ -7,8 +7,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| Key | Action | Info |
|
||||
|-----|--------|-------------|
|
||||
| `` <ctrl+r> `` | 최근에 사용한 저장소로 전환 | |
|
||||
| `` <pgup> (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 | |
|
||||
| `` <pgdown> (fn+down/shift+j) `` | 메인 패널을 아래로로 스크롤 | |
|
||||
| `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | 메인 패널을 위로 스크롤 | |
|
||||
| `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | 메인 패널을 아래로로 스크롤 | |
|
||||
| `` @ `` | 명령어 로그 메뉴 열기 | View options for the command log e.g. show/hide the command log and focus the command log. |
|
||||
| `` P `` | 푸시 | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
|
||||
| `` p `` | 업데이트 | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
|
||||
@@ -26,8 +26,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| `` <esc> `` | 취소 | |
|
||||
| `` ? `` | 매뉴 열기 | |
|
||||
| `` <ctrl+s> `` | View filter-by-path options | View options for filtering the commit log, so that only commits matching the filter are shown. |
|
||||
| `` W `` | Diff 메뉴 열기 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` <ctrl+e> `` | Diff 메뉴 열기 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` W, <ctrl+e> `` | Diff 메뉴 열기 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` q, <ctrl+c> `` | 종료 | |
|
||||
| `` <ctrl+z> `` | Suspend the application | |
|
||||
| `` <ctrl+w> `` | 공백문자를 Diff 뷰에서 표시 여부 전환 | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
|
||||
@@ -40,8 +39,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` , `` | 이전 페이지 | |
|
||||
| `` . `` | 다음 페이지 | |
|
||||
| `` < (<home>) `` | 맨 위로 스크롤 | |
|
||||
| `` > (<end>) `` | 맨 아래로 스크롤 | |
|
||||
| `` <, <home> `` | 맨 위로 스크롤 | |
|
||||
| `` >, <end> `` | 맨 아래로 스크롤 | |
|
||||
| `` v `` | 드래그 선택 전환 | |
|
||||
| `` <shift+down> `` | Range select down | |
|
||||
| `` <shift+up> `` | Range select up | |
|
||||
@@ -144,8 +143,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` <space> `` | Pick hunk | |
|
||||
| `` b `` | Pick all hunks | |
|
||||
| `` <up> `` | 이전 hunk를 선택 | |
|
||||
| `` <down> `` | 다음 hunk를 선택 | |
|
||||
| `` <up>, k `` | 이전 hunk를 선택 | |
|
||||
| `` <down>, j `` | 다음 hunk를 선택 | |
|
||||
| `` <left>, h `` | 이전 충돌을 선택 | |
|
||||
| `` <right>, l `` | 다음 충돌을 선택 | |
|
||||
| `` z `` | 되돌리기 | Undo last merge conflict resolution. |
|
||||
|
||||
@@ -7,8 +7,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| Key | Action | Info |
|
||||
|-----|--------|-------------|
|
||||
| `` <ctrl+r> `` | Wissel naar een recente repo | |
|
||||
| `` <pgup> (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel | |
|
||||
| `` <pgdown> (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel | |
|
||||
| `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | Scroll naar beneden vanaf hoofdpaneel | |
|
||||
| `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | Scroll naar beneden vanaf hoofdpaneel | |
|
||||
| `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
|
||||
| `` P `` | Push | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
|
||||
| `` p `` | Pull | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
|
||||
@@ -26,8 +26,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| `` <esc> `` | Annuleren | |
|
||||
| `` ? `` | Open menu | |
|
||||
| `` <ctrl+s> `` | Bekijk scoping opties | View options for filtering the commit log, so that only commits matching the filter are shown. |
|
||||
| `` W `` | Open diff menu | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` <ctrl+e> `` | Open diff menu | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` W, <ctrl+e> `` | Open diff menu | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` q, <ctrl+c> `` | Quit | |
|
||||
| `` <ctrl+z> `` | Suspend the application | |
|
||||
| `` <ctrl+w> `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
|
||||
@@ -40,8 +39,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` , `` | Vorige pagina | |
|
||||
| `` . `` | Volgende pagina | |
|
||||
| `` < (<home>) `` | Scroll naar boven | |
|
||||
| `` > (<end>) `` | Scroll naar beneden | |
|
||||
| `` <, <home> `` | Scroll naar boven | |
|
||||
| `` >, <end> `` | Scroll naar beneden | |
|
||||
| `` v `` | Toggle drag selecteer | |
|
||||
| `` <shift+down> `` | Range select down | |
|
||||
| `` <shift+up> `` | Range select up | |
|
||||
@@ -213,8 +212,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` <space> `` | Kies stuk | |
|
||||
| `` b `` | Kies beide stukken | |
|
||||
| `` <up> `` | Selecteer bovenste hunk | |
|
||||
| `` <down> `` | Selecteer onderste hunk | |
|
||||
| `` <up>, k `` | Selecteer bovenste hunk | |
|
||||
| `` <down>, j `` | Selecteer onderste hunk | |
|
||||
| `` <left>, h `` | Selecteer voorgaand conflict | |
|
||||
| `` <right>, l `` | Selecteer volgende conflict | |
|
||||
| `` z `` | Ongedaan maken | Undo last merge conflict resolution. |
|
||||
|
||||
@@ -7,8 +7,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| Key | Action | Info |
|
||||
|-----|--------|-------------|
|
||||
| `` <ctrl+r> `` | Przełącz na ostatnie repozytorium | |
|
||||
| `` <pgup> (fn+up/shift+k) `` | Przewiń główne okno w górę | |
|
||||
| `` <pgdown> (fn+down/shift+j) `` | Przewiń główne okno w dół | |
|
||||
| `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | Przewiń główne okno w górę | |
|
||||
| `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | Przewiń główne okno w dół | |
|
||||
| `` @ `` | Pokaż opcje dziennika poleceń | Pokaż opcje dla dziennika poleceń, np. pokazywanie/ukrywanie dziennika poleceń i skupienie na dzienniku poleceń. |
|
||||
| `` P `` | Wypchnij | Wypchnij bieżącą gałąź do jej gałęzi nadrzędnej. Jeśli nie skonfigurowano gałęzi nadrzędnej, zostaniesz poproszony o skonfigurowanie gałęzi nadrzędnej. |
|
||||
| `` p `` | Pociągnij | Pociągnij zmiany z zdalnego dla bieżącej gałęzi. Jeśli nie skonfigurowano gałęzi nadrzędnej, zostaniesz poproszony o skonfigurowanie gałęzi nadrzędnej. |
|
||||
@@ -26,8 +26,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| `` <esc> `` | Anuluj | |
|
||||
| `` ? `` | Otwórz menu przypisań klawiszy | |
|
||||
| `` <ctrl+s> `` | Pokaż opcje filtrowania | Pokaż opcje filtrowania dziennika commitów, tak aby pokazywane były tylko commity pasujące do filtra. |
|
||||
| `` W `` | Pokaż opcje różnicowania | Pokaż opcje dotyczące różnicowania dwóch refów, np. różnicowanie względem wybranego refa, wprowadzanie refa do różnicowania i odwracanie kierunku różnic. |
|
||||
| `` <ctrl+e> `` | Pokaż opcje różnicowania | Pokaż opcje dotyczące różnicowania dwóch refów, np. różnicowanie względem wybranego refa, wprowadzanie refa do różnicowania i odwracanie kierunku różnic. |
|
||||
| `` W, <ctrl+e> `` | Pokaż opcje różnicowania | Pokaż opcje dotyczące różnicowania dwóch refów, np. różnicowanie względem wybranego refa, wprowadzanie refa do różnicowania i odwracanie kierunku różnic. |
|
||||
| `` q, <ctrl+c> `` | Wyjdź | |
|
||||
| `` <ctrl+z> `` | Suspend the application | |
|
||||
| `` <ctrl+w> `` | Przełącz białe znaki | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
|
||||
@@ -40,8 +39,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` , `` | Poprzednia strona | |
|
||||
| `` . `` | Następna strona | |
|
||||
| `` < (<home>) `` | Przewiń do góry | |
|
||||
| `` > (<end>) `` | Przewiń do dołu | |
|
||||
| `` <, <home> `` | Przewiń do góry | |
|
||||
| `` >, <end> `` | Przewiń do dołu | |
|
||||
| `` v `` | Przełącz zaznaczenie zakresu | |
|
||||
| `` <shift+down> `` | Zaznacz zakres w dół | |
|
||||
| `` <shift+up> `` | Zaznacz zakres w górę | |
|
||||
@@ -189,8 +188,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` <space> `` | Wybierz fragment | |
|
||||
| `` b `` | Wybierz wszystkie fragmenty | |
|
||||
| `` <up> `` | Poprzedni fragment | |
|
||||
| `` <down> `` | Następny fragment | |
|
||||
| `` <up>, k `` | Poprzedni fragment | |
|
||||
| `` <down>, j `` | Następny fragment | |
|
||||
| `` <left>, h `` | Poprzedni konflikt | |
|
||||
| `` <right>, l `` | Następny konflikt | |
|
||||
| `` z `` | Cofnij | Cofnij ostatnie rozwiązanie konfliktu scalania. |
|
||||
|
||||
@@ -7,8 +7,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| Key | Action | Info |
|
||||
|-----|--------|-------------|
|
||||
| `` <ctrl+r> `` | Mudar para um repositório recente | |
|
||||
| `` <pgup> (fn+up/shift+k) `` | Rolar janela principal para cima | |
|
||||
| `` <pgdown> (fn+down/shift+j) `` | Rolar a janela principal para baixo | |
|
||||
| `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | Rolar janela principal para cima | |
|
||||
| `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | Rolar a janela principal para baixo | |
|
||||
| `` @ `` | View command log options | View options for the command log e.g. show/hide the command log and focus the command log. |
|
||||
| `` P `` | Empurre (Push) | Faça push do branch atual para o seu branch upstream. Se nenhum upstream estiver configurado, você será solicitado a configurar um branch a montante. |
|
||||
| `` p `` | Puxar (Pull) | Puxe alterações do controle remoto para o ramo atual. Se nenhum upstream estiver configurado, será solicitado configurar um ramo a montante. |
|
||||
@@ -26,8 +26,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| `` <esc> `` | Cancelar | |
|
||||
| `` ? `` | Abrir o menu de atalhos do teclado | |
|
||||
| `` <ctrl+s> `` | Ver opções de filtro | View options for filtering the commit log, so that only commits matching the filter are shown. |
|
||||
| `` W `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` <ctrl+e> `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` W, <ctrl+e> `` | View diffing options | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` q, <ctrl+c> `` | Sair | |
|
||||
| `` <ctrl+z> `` | Suspender a aplicação | |
|
||||
| `` <ctrl+w> `` | Toggle whitespace | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
|
||||
@@ -40,8 +39,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` , `` | Aba anterior | |
|
||||
| `` . `` | Próxima aba | |
|
||||
| `` < (<home>) `` | Voltar ao topo | |
|
||||
| `` > (<end>) `` | Ir para o final | |
|
||||
| `` <, <home> `` | Voltar ao topo | |
|
||||
| `` >, <end> `` | Ir para o final | |
|
||||
| `` v `` | Toggle range select | |
|
||||
| `` <shift+down> `` | Range select down | |
|
||||
| `` <shift+up> `` | Range select up | |
|
||||
@@ -273,8 +272,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` <space> `` | Escolha o local | |
|
||||
| `` b `` | Pegar todos os pedaços | |
|
||||
| `` <up> `` | Trecho anterior | |
|
||||
| `` <down> `` | Próximo trecho | |
|
||||
| `` <up>, k `` | Trecho anterior | |
|
||||
| `` <down>, j `` | Próximo trecho | |
|
||||
| `` <left>, h `` | Conflito anterior | |
|
||||
| `` <right>, l `` | Próximo conflito | |
|
||||
| `` z `` | Desfazer | Desfazer resolução de conflitos de última mesclagem. |
|
||||
|
||||
@@ -7,8 +7,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| Key | Action | Info |
|
||||
|-----|--------|-------------|
|
||||
| `` <ctrl+r> `` | Переключиться на последний репозиторий | |
|
||||
| `` <pgup> (fn+up/shift+k) `` | Прокрутить вверх главную панель | |
|
||||
| `` <pgdown> (fn+down/shift+j) `` | Прокрутить вниз главную панель | |
|
||||
| `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | Прокрутить вверх главную панель | |
|
||||
| `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | Прокрутить вниз главную панель | |
|
||||
| `` @ `` | Открыть меню журнала команд | View options for the command log e.g. show/hide the command log and focus the command log. |
|
||||
| `` P `` | Отправить изменения | Push the current branch to its upstream branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
|
||||
| `` p `` | Получить и слить изменения | Pull changes from the remote for the current branch. If no upstream is configured, you will be prompted to configure an upstream branch. |
|
||||
@@ -26,8 +26,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| `` <esc> `` | Отменить | |
|
||||
| `` ? `` | Открыть меню | |
|
||||
| `` <ctrl+s> `` | Просмотреть параметры фильтрации по пути | View options for filtering the commit log, so that only commits matching the filter are shown. |
|
||||
| `` W `` | Открыть меню сравнении | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` <ctrl+e> `` | Открыть меню сравнении | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` W, <ctrl+e> `` | Открыть меню сравнении | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` q, <ctrl+c> `` | Выйти | |
|
||||
| `` <ctrl+z> `` | Suspend the application | |
|
||||
| `` <ctrl+w> `` | Переключить отображение изменении пробелов в просмотрщике сравнении | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
|
||||
@@ -40,8 +39,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` , `` | Предыдущая страница | |
|
||||
| `` . `` | Следующая страница | |
|
||||
| `` < (<home>) `` | Пролистать наверх | |
|
||||
| `` > (<end>) `` | Прокрутить вниз | |
|
||||
| `` <, <home> `` | Пролистать наверх | |
|
||||
| `` >, <end> `` | Прокрутить вниз | |
|
||||
| `` v `` | Переключить выборку перетаскивания | |
|
||||
| `` <shift+down> `` | Range select down | |
|
||||
| `` <shift+up> `` | Range select up | |
|
||||
@@ -114,8 +113,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` <space> `` | Выбрать эту часть | |
|
||||
| `` b `` | Выбрать все части | |
|
||||
| `` <up> `` | Выбрать предыдущую часть | |
|
||||
| `` <down> `` | Выбрать следующую часть | |
|
||||
| `` <up>, k `` | Выбрать предыдущую часть | |
|
||||
| `` <down>, j `` | Выбрать следующую часть | |
|
||||
| `` <left>, h `` | Выбрать предыдущий конфликт | |
|
||||
| `` <right>, l `` | Выбрать следующий конфликт | |
|
||||
| `` z `` | Отменить | Undo last merge conflict resolution. |
|
||||
|
||||
@@ -7,8 +7,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| Key | Action | Info |
|
||||
|-----|--------|-------------|
|
||||
| `` <ctrl+r> `` | 切换到最近的仓库 | |
|
||||
| `` <pgup> (fn+up/shift+k) `` | 向上滚动主面板 | |
|
||||
| `` <pgdown> (fn+down/shift+j) `` | 向下滚动主面板 | |
|
||||
| `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | 向上滚动主面板 | |
|
||||
| `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | 向下滚动主面板 | |
|
||||
| `` @ `` | 打开命令日志菜单 | 查看命令日志的选项，例如显示/隐藏命令日志以及聚焦命令日志 |
|
||||
| `` P `` | 推送 | 推送当前分支到它的上游。如果上游未配置，您可以在弹窗中配置上游分支。 |
|
||||
| `` p `` | 拉取 | 从当前分支的远程分支获取改动。如果上游未配置，您可以在弹窗中配置上游分支。 |
|
||||
@@ -26,8 +26,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| `` <esc> `` | 取消 | |
|
||||
| `` ? `` | 打开菜单 | |
|
||||
| `` <ctrl+s> `` | 查看按路径过滤选项 | 查看用于过滤提交日志的选项，以便仅显示与过滤器匹配的提交。 |
|
||||
| `` W `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 |
|
||||
| `` <ctrl+e> `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 |
|
||||
| `` W, <ctrl+e> `` | 打开 diff 菜单 | 查看与比较两个引用相关的选项，例如与选定的 ref 进行比较，输入要比较的 ref，然后反转比较方向。 |
|
||||
| `` q, <ctrl+c> `` | 退出 | |
|
||||
| `` <ctrl+z> `` | 挂起应用程序 | |
|
||||
| `` <ctrl+w> `` | 切换是否在差异视图中显示空白字符差异 | 切换是否在差异视图中显示空白字符更改。<br><br>默认值可在配置文件中通过键 'git.ignoreWhitespaceInDiffView' 更改。 |
|
||||
@@ -40,8 +39,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` , `` | 上一页 | |
|
||||
| `` . `` | 下一页 | |
|
||||
| `` < (<home>) `` | 滚动到顶部 | |
|
||||
| `` > (<end>) `` | 滚动到底部 | |
|
||||
| `` <, <home> `` | 滚动到顶部 | |
|
||||
| `` >, <end> `` | 滚动到底部 | |
|
||||
| `` v `` | 切换拖动选择 | |
|
||||
| `` <shift+down> `` | 向下扩展选择范围 | |
|
||||
| `` <shift+up> `` | 向上扩展选择范围 | |
|
||||
@@ -294,8 +293,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` <space> `` | 选中区块 | |
|
||||
| `` b `` | 选中所有区块 | |
|
||||
| `` <up> `` | 选择顶部块 | |
|
||||
| `` <down> `` | 选择底部块 | |
|
||||
| `` <up>, k `` | 选择顶部块 | |
|
||||
| `` <down>, j `` | 选择底部块 | |
|
||||
| `` <left>, h `` | 选择上一个冲突 | |
|
||||
| `` <right>, l `` | 选择下一个冲突 | |
|
||||
| `` z `` | 撤销 | 撤消上次合并冲突解决 |
|
||||
|
||||
@@ -7,8 +7,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| Key | Action | Info |
|
||||
|-----|--------|-------------|
|
||||
| `` <ctrl+r> `` | 切換到最近使用的版本庫 | |
|
||||
| `` <pgup> (fn+up/shift+k) `` | 向上捲動主面板 | |
|
||||
| `` <pgdown> (fn+down/shift+j) `` | 向下捲動主面板 | |
|
||||
| `` <pgup>, K, <ctrl+u> (fn+up/shift+k) `` | 向上捲動主面板 | |
|
||||
| `` <pgdown>, J, <ctrl+d> (fn+down/shift+j) `` | 向下捲動主面板 | |
|
||||
| `` @ `` | 開啟命令記錄選單 | View options for the command log e.g. show/hide the command log and focus the command log. |
|
||||
| `` P `` | 推送 | 推送到遠端。如果沒有設定遠端，會開啟設定視窗。 |
|
||||
| `` p `` | 拉取 | 從遠端同步當前分支。如果沒有設定遠端，會開啟設定視窗。 |
|
||||
@@ -26,8 +26,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
| `` <esc> `` | 取消 | |
|
||||
| `` ? `` | 開啟選單 | |
|
||||
| `` <ctrl+s> `` | 檢視篩選路徑選項 | View options for filtering the commit log, so that only commits matching the filter are shown. |
|
||||
| `` W `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` <ctrl+e> `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` W, <ctrl+e> `` | 開啟差異比較選單 | View options relating to diffing two refs e.g. diffing against selected ref, entering ref to diff against, and reversing the diff direction. |
|
||||
| `` q, <ctrl+c> `` | 結束 | |
|
||||
| `` <ctrl+z> `` | Suspend the application | |
|
||||
| `` <ctrl+w> `` | 切換是否在差異檢視中顯示空格變更 | Toggle whether or not whitespace changes are shown in the diff view.<br><br>The default can be changed in the config file with the key 'git.ignoreWhitespaceInDiffView'. |
|
||||
@@ -40,8 +39,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` , `` | 上一頁 | |
|
||||
| `` . `` | 下一頁 | |
|
||||
| `` < (<home>) `` | 捲動到頂部 | |
|
||||
| `` > (<end>) `` | 捲動到底部 | |
|
||||
| `` <, <home> `` | 捲動到頂部 | |
|
||||
| `` >, <end> `` | 捲動到底部 | |
|
||||
| `` v `` | 切換拖曳選擇 | |
|
||||
| `` <shift+down> `` | Range select down | |
|
||||
| `` <shift+up> `` | Range select up | |
|
||||
@@ -90,8 +89,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
|
||||
|-----|--------|-------------|
|
||||
| `` <space> `` | 挑選程式碼片段 | |
|
||||
| `` b `` | 挑選所有程式碼片段 | |
|
||||
| `` <up> `` | 選擇上一段 | |
|
||||
| `` <down> `` | 選擇下一段 | |
|
||||
| `` <up>, k `` | 選擇上一段 | |
|
||||
| `` <down>, j `` | 選擇下一段 | |
|
||||
| `` <left>, h `` | 選擇上一個衝突 | |
|
||||
| `` <right>, l `` | 選擇下一個衝突 | |
|
||||
| `` z `` | 復原 | Undo last merge conflict resolution. |
|
||||
|
||||
+107
-79
@@ -425,85 +425,99 @@ type KeybindingConfig struct {
|
||||
type KeybindingUniversalConfig struct {
|
||||
Quit Keybinding `yaml:"quit"`
|
||||
// Deprecated: add the key to `quit` instead.
|
||||
QuitAlt1 Keybinding `yaml:"quit-alt1"`
|
||||
SuspendApp Keybinding `yaml:"suspendApp"`
|
||||
Return Keybinding `yaml:"return"`
|
||||
QuitWithoutChangingDirectory Keybinding `yaml:"quitWithoutChangingDirectory"`
|
||||
TogglePanel Keybinding `yaml:"togglePanel"`
|
||||
PrevItem Keybinding `yaml:"prevItem"`
|
||||
NextItem Keybinding `yaml:"nextItem"`
|
||||
PrevItemAlt Keybinding `yaml:"prevItem-alt"`
|
||||
NextItemAlt Keybinding `yaml:"nextItem-alt"`
|
||||
PrevPage Keybinding `yaml:"prevPage"`
|
||||
NextPage Keybinding `yaml:"nextPage"`
|
||||
ScrollLeft Keybinding `yaml:"scrollLeft"`
|
||||
ScrollRight Keybinding `yaml:"scrollRight"`
|
||||
GotoTop Keybinding `yaml:"gotoTop"`
|
||||
GotoBottom Keybinding `yaml:"gotoBottom"`
|
||||
GotoTopAlt Keybinding `yaml:"gotoTop-alt"`
|
||||
GotoBottomAlt Keybinding `yaml:"gotoBottom-alt"`
|
||||
ToggleRangeSelect Keybinding `yaml:"toggleRangeSelect"`
|
||||
RangeSelectDown Keybinding `yaml:"rangeSelectDown"`
|
||||
RangeSelectUp Keybinding `yaml:"rangeSelectUp"`
|
||||
PrevBlock Keybinding `yaml:"prevBlock"`
|
||||
NextBlock Keybinding `yaml:"nextBlock"`
|
||||
PrevBlockAlt Keybinding `yaml:"prevBlock-alt"`
|
||||
NextBlockAlt Keybinding `yaml:"nextBlock-alt"`
|
||||
NextBlockAlt2 Keybinding `yaml:"nextBlock-alt2"`
|
||||
PrevBlockAlt2 Keybinding `yaml:"prevBlock-alt2"`
|
||||
JumpToBlock []Keybinding `yaml:"jumpToBlock"`
|
||||
FocusMainView Keybinding `yaml:"focusMainView"`
|
||||
NextMatch Keybinding `yaml:"nextMatch"`
|
||||
PrevMatch Keybinding `yaml:"prevMatch"`
|
||||
StartSearch Keybinding `yaml:"startSearch"`
|
||||
MoveWordLeft Keybinding `yaml:"moveWordLeft"` // <alt+left> on Mac
|
||||
MoveWordRight Keybinding `yaml:"moveWordRight"` // <alt+right> on Mac
|
||||
BackspaceWord Keybinding `yaml:"backspaceWord"` // <alt+backspace> on Mac
|
||||
ForwardDeleteWord Keybinding `yaml:"forwardDeleteWord"` // <alt+delete> on Mac
|
||||
OptionMenu Keybinding `yaml:"optionMenu"`
|
||||
Select Keybinding `yaml:"select"`
|
||||
GoInto Keybinding `yaml:"goInto"`
|
||||
Confirm Keybinding `yaml:"confirm"`
|
||||
ConfirmMenu Keybinding `yaml:"confirmMenu"`
|
||||
ConfirmSuggestion Keybinding `yaml:"confirmSuggestion"`
|
||||
ConfirmInEditor Keybinding `yaml:"confirmInEditor"` // <meta+enter> on Mac
|
||||
ConfirmInEditorAlt Keybinding `yaml:"confirmInEditor-alt"`
|
||||
Remove Keybinding `yaml:"remove"`
|
||||
New Keybinding `yaml:"new"`
|
||||
Edit Keybinding `yaml:"edit"`
|
||||
OpenFile Keybinding `yaml:"openFile"`
|
||||
ScrollUpMain Keybinding `yaml:"scrollUpMain"`
|
||||
ScrollDownMain Keybinding `yaml:"scrollDownMain"`
|
||||
ScrollUpMainAlt1 Keybinding `yaml:"scrollUpMain-alt1"`
|
||||
ScrollDownMainAlt1 Keybinding `yaml:"scrollDownMain-alt1"`
|
||||
ScrollUpMainAlt2 Keybinding `yaml:"scrollUpMain-alt2"`
|
||||
ScrollDownMainAlt2 Keybinding `yaml:"scrollDownMain-alt2"`
|
||||
ExecuteShellCommand Keybinding `yaml:"executeShellCommand"`
|
||||
CreateRebaseOptionsMenu Keybinding `yaml:"createRebaseOptionsMenu"`
|
||||
Push Keybinding `yaml:"pushFiles"` // 'Files' appended for legacy reasons
|
||||
Pull Keybinding `yaml:"pullFiles"` // 'Files' appended for legacy reasons
|
||||
Refresh Keybinding `yaml:"refresh"`
|
||||
CreatePatchOptionsMenu Keybinding `yaml:"createPatchOptionsMenu"`
|
||||
NextTab Keybinding `yaml:"nextTab"`
|
||||
PrevTab Keybinding `yaml:"prevTab"`
|
||||
NextScreenMode Keybinding `yaml:"nextScreenMode"`
|
||||
PrevScreenMode Keybinding `yaml:"prevScreenMode"`
|
||||
CyclePagers Keybinding `yaml:"cyclePagers"`
|
||||
Undo Keybinding `yaml:"undo"`
|
||||
Redo Keybinding `yaml:"redo"`
|
||||
FilteringMenu Keybinding `yaml:"filteringMenu"`
|
||||
DiffingMenu Keybinding `yaml:"diffingMenu"`
|
||||
DiffingMenuAlt Keybinding `yaml:"diffingMenu-alt"`
|
||||
CopyToClipboard Keybinding `yaml:"copyToClipboard"`
|
||||
OpenRecentRepos Keybinding `yaml:"openRecentRepos"`
|
||||
SubmitEditorText Keybinding `yaml:"submitEditorText"`
|
||||
ExtrasMenu Keybinding `yaml:"extrasMenu"`
|
||||
ToggleWhitespaceInDiffView Keybinding `yaml:"toggleWhitespaceInDiffView"`
|
||||
IncreaseContextInDiffView Keybinding `yaml:"increaseContextInDiffView"`
|
||||
DecreaseContextInDiffView Keybinding `yaml:"decreaseContextInDiffView"`
|
||||
IncreaseRenameSimilarityThreshold Keybinding `yaml:"increaseRenameSimilarityThreshold"`
|
||||
DecreaseRenameSimilarityThreshold Keybinding `yaml:"decreaseRenameSimilarityThreshold"`
|
||||
OpenDiffTool Keybinding `yaml:"openDiffTool"`
|
||||
QuitAlt1 Keybinding `yaml:"quit-alt1"`
|
||||
SuspendApp Keybinding `yaml:"suspendApp"`
|
||||
Return Keybinding `yaml:"return"`
|
||||
QuitWithoutChangingDirectory Keybinding `yaml:"quitWithoutChangingDirectory"`
|
||||
TogglePanel Keybinding `yaml:"togglePanel"`
|
||||
PrevItem Keybinding `yaml:"prevItem"`
|
||||
NextItem Keybinding `yaml:"nextItem"`
|
||||
// Deprecated: add the key to `prevItem` instead.
|
||||
PrevItemAlt Keybinding `yaml:"prevItem-alt"`
|
||||
// Deprecated: add the key to `nextItem` instead.
|
||||
NextItemAlt Keybinding `yaml:"nextItem-alt"`
|
||||
PrevPage Keybinding `yaml:"prevPage"`
|
||||
NextPage Keybinding `yaml:"nextPage"`
|
||||
ScrollLeft Keybinding `yaml:"scrollLeft"`
|
||||
ScrollRight Keybinding `yaml:"scrollRight"`
|
||||
GotoTop Keybinding `yaml:"gotoTop"`
|
||||
GotoBottom Keybinding `yaml:"gotoBottom"`
|
||||
// Deprecated: add the key to `gotoTop` instead.
|
||||
GotoTopAlt Keybinding `yaml:"gotoTop-alt"`
|
||||
// Deprecated: add the key to `gotoBottom` instead.
|
||||
GotoBottomAlt Keybinding `yaml:"gotoBottom-alt"`
|
||||
ToggleRangeSelect Keybinding `yaml:"toggleRangeSelect"`
|
||||
RangeSelectDown Keybinding `yaml:"rangeSelectDown"`
|
||||
RangeSelectUp Keybinding `yaml:"rangeSelectUp"`
|
||||
PrevBlock Keybinding `yaml:"prevBlock"`
|
||||
NextBlock Keybinding `yaml:"nextBlock"`
|
||||
// Deprecated: add the key to `prevBlock` instead.
|
||||
PrevBlockAlt Keybinding `yaml:"prevBlock-alt"`
|
||||
// Deprecated: add the key to `nextBlock` instead.
|
||||
NextBlockAlt Keybinding `yaml:"nextBlock-alt"`
|
||||
// Deprecated: add the key to `nextBlock` instead.
|
||||
NextBlockAlt2 Keybinding `yaml:"nextBlock-alt2"`
|
||||
// Deprecated: add the key to `prevBlock` instead.
|
||||
PrevBlockAlt2 Keybinding `yaml:"prevBlock-alt2"`
|
||||
JumpToBlock []Keybinding `yaml:"jumpToBlock"`
|
||||
FocusMainView Keybinding `yaml:"focusMainView"`
|
||||
NextMatch Keybinding `yaml:"nextMatch"`
|
||||
PrevMatch Keybinding `yaml:"prevMatch"`
|
||||
StartSearch Keybinding `yaml:"startSearch"`
|
||||
MoveWordLeft Keybinding `yaml:"moveWordLeft"` // <alt+left> on Mac
|
||||
MoveWordRight Keybinding `yaml:"moveWordRight"` // <alt+right> on Mac
|
||||
BackspaceWord Keybinding `yaml:"backspaceWord"` // <alt+backspace> on Mac
|
||||
ForwardDeleteWord Keybinding `yaml:"forwardDeleteWord"` // <alt+delete> on Mac
|
||||
OptionMenu Keybinding `yaml:"optionMenu"`
|
||||
Select Keybinding `yaml:"select"`
|
||||
GoInto Keybinding `yaml:"goInto"`
|
||||
Confirm Keybinding `yaml:"confirm"`
|
||||
ConfirmMenu Keybinding `yaml:"confirmMenu"`
|
||||
ConfirmSuggestion Keybinding `yaml:"confirmSuggestion"`
|
||||
ConfirmInEditor Keybinding `yaml:"confirmInEditor"` // <meta+enter> on Mac
|
||||
// Deprecated: add the key to `confirmInEditor` instead.
|
||||
ConfirmInEditorAlt Keybinding `yaml:"confirmInEditor-alt"`
|
||||
Remove Keybinding `yaml:"remove"`
|
||||
New Keybinding `yaml:"new"`
|
||||
Edit Keybinding `yaml:"edit"`
|
||||
OpenFile Keybinding `yaml:"openFile"`
|
||||
ScrollUpMain Keybinding `yaml:"scrollUpMain"`
|
||||
ScrollDownMain Keybinding `yaml:"scrollDownMain"`
|
||||
// Deprecated: add the key to `scrollUpMain` instead.
|
||||
ScrollUpMainAlt1 Keybinding `yaml:"scrollUpMain-alt1"`
|
||||
// Deprecated: add the key to `scrollDownMain` instead.
|
||||
ScrollDownMainAlt1 Keybinding `yaml:"scrollDownMain-alt1"`
|
||||
// Deprecated: add the key to `scrollUpMain` instead.
|
||||
ScrollUpMainAlt2 Keybinding `yaml:"scrollUpMain-alt2"`
|
||||
// Deprecated: add the key to `scrollDownMain` instead.
|
||||
ScrollDownMainAlt2 Keybinding `yaml:"scrollDownMain-alt2"`
|
||||
ExecuteShellCommand Keybinding `yaml:"executeShellCommand"`
|
||||
CreateRebaseOptionsMenu Keybinding `yaml:"createRebaseOptionsMenu"`
|
||||
Push Keybinding `yaml:"pushFiles"` // 'Files' appended for legacy reasons
|
||||
Pull Keybinding `yaml:"pullFiles"` // 'Files' appended for legacy reasons
|
||||
Refresh Keybinding `yaml:"refresh"`
|
||||
CreatePatchOptionsMenu Keybinding `yaml:"createPatchOptionsMenu"`
|
||||
NextTab Keybinding `yaml:"nextTab"`
|
||||
PrevTab Keybinding `yaml:"prevTab"`
|
||||
NextScreenMode Keybinding `yaml:"nextScreenMode"`
|
||||
PrevScreenMode Keybinding `yaml:"prevScreenMode"`
|
||||
CyclePagers Keybinding `yaml:"cyclePagers"`
|
||||
Undo Keybinding `yaml:"undo"`
|
||||
Redo Keybinding `yaml:"redo"`
|
||||
FilteringMenu Keybinding `yaml:"filteringMenu"`
|
||||
DiffingMenu Keybinding `yaml:"diffingMenu"`
|
||||
// Deprecated: add the key to `diffingMenu` instead.
|
||||
DiffingMenuAlt Keybinding `yaml:"diffingMenu-alt"`
|
||||
CopyToClipboard Keybinding `yaml:"copyToClipboard"`
|
||||
OpenRecentRepos Keybinding `yaml:"openRecentRepos"`
|
||||
SubmitEditorText Keybinding `yaml:"submitEditorText"`
|
||||
ExtrasMenu Keybinding `yaml:"extrasMenu"`
|
||||
ToggleWhitespaceInDiffView Keybinding `yaml:"toggleWhitespaceInDiffView"`
|
||||
IncreaseContextInDiffView Keybinding `yaml:"increaseContextInDiffView"`
|
||||
DecreaseContextInDiffView Keybinding `yaml:"decreaseContextInDiffView"`
|
||||
IncreaseRenameSimilarityThreshold Keybinding `yaml:"increaseRenameSimilarityThreshold"`
|
||||
DecreaseRenameSimilarityThreshold Keybinding `yaml:"decreaseRenameSimilarityThreshold"`
|
||||
OpenDiffTool Keybinding `yaml:"openDiffTool"`
|
||||
}
|
||||
|
||||
type KeybindingStatusConfig struct {
|
||||
@@ -778,6 +792,20 @@ type IconProperties struct {
|
||||
// release.
|
||||
func (c *KeybindingConfig) MergeLegacyAltKeybindings() {
|
||||
mergeLegacyAlt(&c.Universal.Quit, c.Universal.QuitAlt1)
|
||||
mergeLegacyAlt(&c.Universal.PrevItem, c.Universal.PrevItemAlt)
|
||||
mergeLegacyAlt(&c.Universal.NextItem, c.Universal.NextItemAlt)
|
||||
mergeLegacyAlt(&c.Universal.GotoTop, c.Universal.GotoTopAlt)
|
||||
mergeLegacyAlt(&c.Universal.GotoBottom, c.Universal.GotoBottomAlt)
|
||||
mergeLegacyAlt(&c.Universal.PrevBlock, c.Universal.PrevBlockAlt)
|
||||
mergeLegacyAlt(&c.Universal.NextBlock, c.Universal.NextBlockAlt)
|
||||
mergeLegacyAlt(&c.Universal.PrevBlock, c.Universal.PrevBlockAlt2)
|
||||
mergeLegacyAlt(&c.Universal.NextBlock, c.Universal.NextBlockAlt2)
|
||||
mergeLegacyAlt(&c.Universal.ConfirmInEditor, c.Universal.ConfirmInEditorAlt)
|
||||
mergeLegacyAlt(&c.Universal.ScrollUpMain, c.Universal.ScrollUpMainAlt1)
|
||||
mergeLegacyAlt(&c.Universal.ScrollUpMain, c.Universal.ScrollUpMainAlt2)
|
||||
mergeLegacyAlt(&c.Universal.ScrollDownMain, c.Universal.ScrollDownMainAlt1)
|
||||
mergeLegacyAlt(&c.Universal.ScrollDownMain, c.Universal.ScrollDownMainAlt2)
|
||||
mergeLegacyAlt(&c.Universal.DiffingMenu, c.Universal.DiffingMenuAlt)
|
||||
}
|
||||
|
||||
func GetDefaultConfig() *UserConfig {
|
||||
|
||||
@@ -136,9 +136,8 @@ func (gui *Gui) getRandomTip() string {
|
||||
config.Universal.NextPage,
|
||||
),
|
||||
fmt.Sprintf(
|
||||
"You can jump to the top/bottom of a panel using '%s (or %s)' and '%s (or %s)'",
|
||||
config.Universal.GotoTop, config.Universal.GotoTopAlt,
|
||||
config.Universal.GotoBottom, config.Universal.GotoBottomAlt,
|
||||
"You can jump to the top/bottom of a panel using '%s' and '%s'",
|
||||
config.Universal.GotoTop, config.Universal.GotoBottom,
|
||||
),
|
||||
fmt.Sprintf(
|
||||
"To collapse/expand a directory, press '%s'",
|
||||
|
||||
@@ -37,10 +37,6 @@ func (self *CommitDescriptionController) GetKeybindings(opts types.KeybindingsOp
|
||||
Keys: opts.GetKeys(opts.Config.Universal.ConfirmInEditor),
|
||||
Handler: self.confirm,
|
||||
},
|
||||
{
|
||||
Keys: opts.GetKeys(opts.Config.Universal.ConfirmInEditorAlt),
|
||||
Handler: self.confirm,
|
||||
},
|
||||
{
|
||||
Keys: opts.GetKeys(opts.Config.CommitMessage.CommitMenu),
|
||||
Handler: self.openCommitMenu,
|
||||
@@ -68,26 +64,12 @@ func (self *CommitDescriptionController) GetMouseKeybindings(opts types.Keybindi
|
||||
func (self *CommitDescriptionController) GetOnFocus() func(types.OnFocusOpts) {
|
||||
return func(types.OnFocusOpts) {
|
||||
footer := ""
|
||||
mainDisabled := len(self.c.UserConfig().Keybinding.Universal.ConfirmInEditor) > 0
|
||||
altDisabled := len(self.c.UserConfig().Keybinding.Universal.ConfirmInEditorAlt) > 0
|
||||
if !mainDisabled || !altDisabled {
|
||||
if mainDisabled {
|
||||
footer = utils.ResolvePlaceholderString(self.c.Tr.CommitDescriptionFooter,
|
||||
map[string]string{
|
||||
"confirmInEditorKeybinding": self.c.UserConfig().Keybinding.Universal.ConfirmInEditorAlt.String(),
|
||||
})
|
||||
} else if altDisabled {
|
||||
footer = utils.ResolvePlaceholderString(self.c.Tr.CommitDescriptionFooter,
|
||||
map[string]string{
|
||||
"confirmInEditorKeybinding": self.c.UserConfig().Keybinding.Universal.ConfirmInEditor.String(),
|
||||
})
|
||||
} else {
|
||||
footer = utils.ResolvePlaceholderString(self.c.Tr.CommitDescriptionFooterTwoBindings,
|
||||
map[string]string{
|
||||
"confirmInEditorKeybinding1": self.c.UserConfig().Keybinding.Universal.ConfirmInEditor.String(),
|
||||
"confirmInEditorKeybinding2": self.c.UserConfig().Keybinding.Universal.ConfirmInEditorAlt.String(),
|
||||
})
|
||||
}
|
||||
keys := self.c.UserConfig().Keybinding.Universal.ConfirmInEditor
|
||||
if len(keys) > 0 {
|
||||
footer = utils.ResolvePlaceholderString(self.c.Tr.CommitDescriptionFooter,
|
||||
map[string]string{
|
||||
"confirmInEditorKeybinding": keys.String(),
|
||||
})
|
||||
}
|
||||
self.c.Views().CommitDescription.Footer = footer
|
||||
}
|
||||
|
||||
@@ -99,13 +99,6 @@ func (self *GlobalController) GetKeybindings(opts types.KeybindingsOpts) []*type
|
||||
Tooltip: self.c.Tr.ViewDiffingOptionsTooltip,
|
||||
OpensMenu: true,
|
||||
},
|
||||
{
|
||||
Keys: opts.GetKeys(opts.Config.Universal.DiffingMenuAlt),
|
||||
Handler: opts.Guards.NoPopupPanel(self.createDiffingMenu),
|
||||
Description: self.c.Tr.ViewDiffingOptions,
|
||||
Tooltip: self.c.Tr.ViewDiffingOptionsTooltip,
|
||||
OpensMenu: true,
|
||||
},
|
||||
{
|
||||
Keys: opts.GetKeys(opts.Config.Universal.Quit),
|
||||
Description: self.c.Tr.Quit,
|
||||
|
||||
@@ -271,16 +271,12 @@ func (self *ListController) isFocused() bool {
|
||||
|
||||
func (self *ListController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
|
||||
bindings := []*types.Binding{
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevItemAlt), Handler: self.HandlePrevLine},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: self.HandlePrevLine},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextItemAlt), Handler: self.HandleNextLine},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: self.HandleNextLine},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevPage), Handler: self.HandlePrevPage, Description: self.c.Tr.PrevPage},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextPage), Handler: self.HandleNextPage, Description: self.c.Tr.NextPage},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: self.HandleGotoTop, Description: self.c.Tr.GotoTop, Alternative: "<home>"},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Handler: self.HandleGotoBottom, Description: self.c.Tr.GotoBottom, Alternative: "<end>"},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoTopAlt), Handler: self.HandleGotoTop},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoBottomAlt), Handler: self.HandleGotoBottom},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: self.HandleGotoTop, Description: self.c.Tr.GotoTop},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Handler: self.HandleGotoBottom, Description: self.c.Tr.GotoBottom},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.ScrollLeft), Handler: self.HandleScrollLeft},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.ScrollRight), Handler: self.HandleScrollRight},
|
||||
}
|
||||
|
||||
@@ -83,14 +83,6 @@ func (self *MergeConflictsController) GetKeybindings(opts types.KeybindingsOpts)
|
||||
Description: self.c.Tr.OpenFile,
|
||||
Tooltip: self.c.Tr.OpenFileTooltip,
|
||||
},
|
||||
{
|
||||
Keys: opts.GetKeys(opts.Config.Universal.PrevItemAlt),
|
||||
Handler: self.withRenderAndFocus(self.PrevConflictHunk),
|
||||
},
|
||||
{
|
||||
Keys: opts.GetKeys(opts.Config.Universal.NextItemAlt),
|
||||
Handler: self.withRenderAndFocus(self.NextConflictHunk),
|
||||
},
|
||||
{
|
||||
Keys: opts.GetKeys(opts.Config.Universal.ScrollLeft),
|
||||
Handler: self.withRenderAndFocus(self.HandleScrollLeft),
|
||||
|
||||
@@ -39,21 +39,11 @@ func (self *PatchExplorerController) Context() types.Context {
|
||||
|
||||
func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
|
||||
return []*types.Binding{
|
||||
{
|
||||
Tag: "navigation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.PrevItemAlt),
|
||||
Handler: self.withRenderAndFocus(self.HandlePrevLine),
|
||||
},
|
||||
{
|
||||
Tag: "navigation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.PrevItem),
|
||||
Handler: self.withRenderAndFocus(self.HandlePrevLine),
|
||||
},
|
||||
{
|
||||
Tag: "navigation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.NextItemAlt),
|
||||
Handler: self.withRenderAndFocus(self.HandleNextLine),
|
||||
},
|
||||
{
|
||||
Tag: "navigation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.NextItem),
|
||||
@@ -123,16 +113,6 @@ func (self *PatchExplorerController) GetKeybindings(opts types.KeybindingsOpts)
|
||||
Description: self.c.Tr.GotoBottom,
|
||||
Handler: self.withRenderAndFocus(self.HandleGotoBottom),
|
||||
},
|
||||
{
|
||||
Tag: "navigation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.GotoTopAlt),
|
||||
Handler: self.withRenderAndFocus(self.HandleGotoTop),
|
||||
},
|
||||
{
|
||||
Tag: "navigation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.GotoBottomAlt),
|
||||
Handler: self.withRenderAndFocus(self.HandleGotoBottom),
|
||||
},
|
||||
{
|
||||
Tag: "navigation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.ScrollLeft),
|
||||
|
||||
@@ -37,10 +37,6 @@ func (self *SideWindowController) GetKeybindings(opts types.KeybindingsOpts) []*
|
||||
return []*types.Binding{
|
||||
{Keys: opts.GetKeys(opts.Config.Universal.PrevBlock), Handler: self.previousSideWindow},
|
||||
{Keys: opts.GetKeys(opts.Config.Universal.NextBlock), Handler: self.nextSideWindow},
|
||||
{Keys: opts.GetKeys(opts.Config.Universal.PrevBlockAlt), Handler: self.previousSideWindow},
|
||||
{Keys: opts.GetKeys(opts.Config.Universal.NextBlockAlt), Handler: self.nextSideWindow},
|
||||
{Keys: opts.GetKeys(opts.Config.Universal.PrevBlockAlt2), Handler: self.previousSideWindow},
|
||||
{Keys: opts.GetKeys(opts.Config.Universal.NextBlockAlt2), Handler: self.nextSideWindow},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -37,15 +37,11 @@ func (self *ViewSelectionController) Context() types.Context {
|
||||
func (self *ViewSelectionController) GetKeybindings(opts types.KeybindingsOpts) []*types.Binding {
|
||||
return []*types.Binding{
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevItem), Handler: self.handlePrevLine},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevItemAlt), Handler: self.handlePrevLine},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextItem), Handler: self.handleNextLine},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextItemAlt), Handler: self.handleNextLine},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.PrevPage), Handler: self.handlePrevPage, Description: self.c.Tr.PrevPage},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.NextPage), Handler: self.handleNextPage, Description: self.c.Tr.NextPage},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: self.handleGotoTop, Description: self.c.Tr.GotoTop, Alternative: "<home>"},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Handler: self.handleGotoBottom, Description: self.c.Tr.GotoBottom, Alternative: "<end>"},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoTopAlt), Handler: self.handleGotoTop},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoBottomAlt), Handler: self.handleGotoBottom},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoTop), Handler: self.handleGotoTop, Description: self.c.Tr.GotoTop},
|
||||
{Tag: "navigation", Keys: opts.GetKeys(opts.Config.Universal.GotoBottom), Handler: self.handleGotoBottom, Description: self.c.Tr.GotoBottom},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -99,26 +99,6 @@ func (gui *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBin
|
||||
Alternative: "fn+down/shift+j",
|
||||
Description: gui.c.Tr.ScrollDownMainWindow,
|
||||
},
|
||||
{
|
||||
ViewName: "",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.ScrollUpMainAlt1),
|
||||
Handler: gui.scrollUpMain,
|
||||
},
|
||||
{
|
||||
ViewName: "",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.ScrollDownMainAlt1),
|
||||
Handler: gui.scrollDownMain,
|
||||
},
|
||||
{
|
||||
ViewName: "",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.ScrollUpMainAlt2),
|
||||
Handler: gui.scrollUpMain,
|
||||
},
|
||||
{
|
||||
ViewName: "",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.ScrollDownMainAlt2),
|
||||
Handler: gui.scrollDownMain,
|
||||
},
|
||||
{
|
||||
ViewName: "files",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard),
|
||||
@@ -228,16 +208,6 @@ func (gui *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBin
|
||||
Keys: opts.GetKeys(opts.Config.Universal.NextItem),
|
||||
Handler: gui.scrollDownConfirmationPanel,
|
||||
},
|
||||
{
|
||||
ViewName: "confirmation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.PrevItemAlt),
|
||||
Handler: gui.scrollUpConfirmationPanel,
|
||||
},
|
||||
{
|
||||
ViewName: "confirmation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.NextItemAlt),
|
||||
Handler: gui.scrollDownConfirmationPanel,
|
||||
},
|
||||
{
|
||||
ViewName: "confirmation",
|
||||
Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseWheelUp)},
|
||||
@@ -263,21 +233,11 @@ func (gui *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBin
|
||||
Keys: opts.GetKeys(opts.Config.Universal.GotoTop),
|
||||
Handler: gui.goToConfirmationPanelTop,
|
||||
},
|
||||
{
|
||||
ViewName: "confirmation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.GotoTopAlt),
|
||||
Handler: gui.goToConfirmationPanelTop,
|
||||
},
|
||||
{
|
||||
ViewName: "confirmation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.GotoBottom),
|
||||
Handler: gui.goToConfirmationPanelBottom,
|
||||
},
|
||||
{
|
||||
ViewName: "confirmation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.GotoBottomAlt),
|
||||
Handler: gui.goToConfirmationPanelBottom,
|
||||
},
|
||||
{
|
||||
ViewName: "submodules",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.CopyToClipboard),
|
||||
@@ -295,12 +255,6 @@ func (gui *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBin
|
||||
Keys: []gocui.Key{gocui.NewKeyName(gocui.MouseWheelDown)},
|
||||
Handler: gui.scrollDownExtra,
|
||||
},
|
||||
{
|
||||
ViewName: "extras",
|
||||
Tag: "navigation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.PrevItemAlt),
|
||||
Handler: gui.scrollUpExtra,
|
||||
},
|
||||
{
|
||||
ViewName: "extras",
|
||||
Tag: "navigation",
|
||||
@@ -313,12 +267,6 @@ func (gui *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBin
|
||||
Keys: opts.GetKeys(opts.Config.Universal.NextItem),
|
||||
Handler: gui.scrollDownExtra,
|
||||
},
|
||||
{
|
||||
ViewName: "extras",
|
||||
Tag: "navigation",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.NextItemAlt),
|
||||
Handler: gui.scrollDownExtra,
|
||||
},
|
||||
{
|
||||
ViewName: "extras",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.NextPage),
|
||||
@@ -334,21 +282,11 @@ func (gui *Gui) GetInitialKeybindings() ([]*types.Binding, []*gocui.ViewMouseBin
|
||||
Keys: opts.GetKeys(opts.Config.Universal.GotoTop),
|
||||
Handler: gui.goToExtrasPanelTop,
|
||||
},
|
||||
{
|
||||
ViewName: "extras",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.GotoTopAlt),
|
||||
Handler: gui.goToExtrasPanelTop,
|
||||
},
|
||||
{
|
||||
ViewName: "extras",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.GotoBottom),
|
||||
Handler: gui.goToExtrasPanelBottom,
|
||||
},
|
||||
{
|
||||
ViewName: "extras",
|
||||
Keys: opts.GetKeys(opts.Config.Universal.GotoBottomAlt),
|
||||
Handler: gui.goToExtrasPanelBottom,
|
||||
},
|
||||
{
|
||||
ViewName: "extras",
|
||||
Tag: "navigation",
|
||||
|
||||
@@ -27,6 +27,10 @@ func (gui *Gui) createMenu(opts types.CreateMenuOptions) error {
|
||||
|
||||
maxColumnSize := 1
|
||||
|
||||
// Only the primary key of each navigation binding is reserved as
|
||||
// essential; alternates (e.g. the historical j/k that lived under
|
||||
// `*Alt` fields) stay available to be reused by menu items, which
|
||||
// take precedence over the inherited list bindings.
|
||||
essentialKeys := []gocui.Key{
|
||||
config.GetValidatedKeyBindingKeys(gui.c.UserConfig().Keybinding.Universal.ConfirmMenu)[0],
|
||||
config.GetValidatedKeyBindingKeys(gui.c.UserConfig().Keybinding.Universal.Return)[0],
|
||||
|
||||
@@ -337,7 +337,6 @@ type TranslationSet struct {
|
||||
CommitDescriptionTitle string
|
||||
CommitDescriptionSubTitle string
|
||||
CommitDescriptionFooter string
|
||||
CommitDescriptionFooterTwoBindings string
|
||||
CommitHooksDisabledSubTitle string
|
||||
LocalBranchesTitle string
|
||||
SearchTitle string
|
||||
@@ -1456,7 +1455,6 @@ func EnglishTranslationSet() *TranslationSet {
|
||||
CommitDescriptionTitle: "Commit description",
|
||||
CommitDescriptionSubTitle: "Press {{.togglePanelKeyBinding}} to toggle focus, {{.commitMenuKeybinding}} to open menu",
|
||||
CommitDescriptionFooter: "Press {{.confirmInEditorKeybinding}} to submit",
|
||||
CommitDescriptionFooterTwoBindings: "Press {{.confirmInEditorKeybinding1}} or {{.confirmInEditorKeybinding2}} to submit",
|
||||
CommitHooksDisabledSubTitle: "(hooks disabled)",
|
||||
LocalBranchesTitle: "Local branches",
|
||||
SearchTitle: "Search",
|
||||
|
||||
+58
-10
@@ -2247,7 +2247,10 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"default": "\u003cup\u003e"
|
||||
"default": [
|
||||
"\u003cup\u003e",
|
||||
"k"
|
||||
]
|
||||
},
|
||||
"nextItem": {
|
||||
"oneOf": [
|
||||
@@ -2261,7 +2264,10 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"default": "\u003cdown\u003e"
|
||||
"default": [
|
||||
"\u003cdown\u003e",
|
||||
"j"
|
||||
]
|
||||
},
|
||||
"prevItem-alt": {
|
||||
"oneOf": [
|
||||
@@ -2275,6 +2281,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `prevItem` instead.",
|
||||
"default": "k"
|
||||
},
|
||||
"nextItem-alt": {
|
||||
@@ -2289,6 +2296,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `nextItem` instead.",
|
||||
"default": "j"
|
||||
},
|
||||
"prevPage": {
|
||||
@@ -2359,7 +2367,10 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"default": "\u003c"
|
||||
"default": [
|
||||
"\u003c",
|
||||
"\u003chome\u003e"
|
||||
]
|
||||
},
|
||||
"gotoBottom": {
|
||||
"oneOf": [
|
||||
@@ -2373,7 +2384,10 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"default": "\u003e"
|
||||
"default": [
|
||||
"\u003e",
|
||||
"\u003cend\u003e"
|
||||
]
|
||||
},
|
||||
"gotoTop-alt": {
|
||||
"oneOf": [
|
||||
@@ -2387,6 +2401,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `gotoTop` instead.",
|
||||
"default": "\u003chome\u003e"
|
||||
},
|
||||
"gotoBottom-alt": {
|
||||
@@ -2401,6 +2416,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `gotoBottom` instead.",
|
||||
"default": "\u003cend\u003e"
|
||||
},
|
||||
"toggleRangeSelect": {
|
||||
@@ -2457,7 +2473,11 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"default": "\u003cleft\u003e"
|
||||
"default": [
|
||||
"\u003cleft\u003e",
|
||||
"h",
|
||||
"\u003cbacktab\u003e"
|
||||
]
|
||||
},
|
||||
"nextBlock": {
|
||||
"oneOf": [
|
||||
@@ -2471,7 +2491,11 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"default": "\u003cright\u003e"
|
||||
"default": [
|
||||
"\u003cright\u003e",
|
||||
"l",
|
||||
"\u003ctab\u003e"
|
||||
]
|
||||
},
|
||||
"prevBlock-alt": {
|
||||
"oneOf": [
|
||||
@@ -2485,6 +2509,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `prevBlock` instead.",
|
||||
"default": "h"
|
||||
},
|
||||
"nextBlock-alt": {
|
||||
@@ -2499,6 +2524,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `nextBlock` instead.",
|
||||
"default": "l"
|
||||
},
|
||||
"nextBlock-alt2": {
|
||||
@@ -2513,6 +2539,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `nextBlock` instead.",
|
||||
"default": "\u003ctab\u003e"
|
||||
},
|
||||
"prevBlock-alt2": {
|
||||
@@ -2527,6 +2554,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `prevBlock` instead.",
|
||||
"default": "\u003cbacktab\u003e"
|
||||
},
|
||||
"jumpToBlock": {
|
||||
@@ -2765,7 +2793,10 @@
|
||||
}
|
||||
],
|
||||
"description": "\u003cmeta+enter\u003e on Mac",
|
||||
"default": "\u003cctrl+enter\u003e"
|
||||
"default": [
|
||||
"\u003cctrl+enter\u003e",
|
||||
"\u003cctrl+s\u003e"
|
||||
]
|
||||
},
|
||||
"confirmInEditor-alt": {
|
||||
"oneOf": [
|
||||
@@ -2779,6 +2810,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `confirmInEditor` instead.",
|
||||
"default": "\u003cctrl+s\u003e"
|
||||
},
|
||||
"remove": {
|
||||
@@ -2849,7 +2881,11 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"default": "\u003cpgup\u003e"
|
||||
"default": [
|
||||
"\u003cpgup\u003e",
|
||||
"K",
|
||||
"\u003cctrl+u\u003e"
|
||||
]
|
||||
},
|
||||
"scrollDownMain": {
|
||||
"oneOf": [
|
||||
@@ -2863,7 +2899,11 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"default": "\u003cpgdown\u003e"
|
||||
"default": [
|
||||
"\u003cpgdown\u003e",
|
||||
"J",
|
||||
"\u003cctrl+d\u003e"
|
||||
]
|
||||
},
|
||||
"scrollUpMain-alt1": {
|
||||
"oneOf": [
|
||||
@@ -2877,6 +2917,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `scrollUpMain` instead.",
|
||||
"default": "K"
|
||||
},
|
||||
"scrollDownMain-alt1": {
|
||||
@@ -2891,6 +2932,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `scrollDownMain` instead.",
|
||||
"default": "J"
|
||||
},
|
||||
"scrollUpMain-alt2": {
|
||||
@@ -2905,6 +2947,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `scrollUpMain` instead.",
|
||||
"default": "\u003cctrl+u\u003e"
|
||||
},
|
||||
"scrollDownMain-alt2": {
|
||||
@@ -2919,6 +2962,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `scrollDownMain` instead.",
|
||||
"default": "\u003cctrl+d\u003e"
|
||||
},
|
||||
"executeShellCommand": {
|
||||
@@ -3131,7 +3175,10 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"default": "W"
|
||||
"default": [
|
||||
"W",
|
||||
"\u003cctrl+e\u003e"
|
||||
]
|
||||
},
|
||||
"diffingMenu-alt": {
|
||||
"oneOf": [
|
||||
@@ -3145,6 +3192,7 @@
|
||||
"type": "array"
|
||||
}
|
||||
],
|
||||
"description": "Deprecated: add the key to `diffingMenu` instead.",
|
||||
"default": "\u003cctrl+e\u003e"
|
||||
},
|
||||
"copyToClipboard": {
|
||||
|
||||
Reference in New Issue
Block a user