diff --git a/docs-master/Config.md b/docs-master/Config.md index 9f79218217f..cb79923a8fa 100644 --- a/docs-master/Config.md +++ b/docs-master/Config.md @@ -622,6 +622,7 @@ keybinding: - "4" - "5" focusMainView: "0" + focusSecondaryView: "9" nextMatch: "n" prevMatch: "N" startSearch: / diff --git a/docs-master/keybindings/Keybindings_en.md b/docs-master/keybindings/Keybindings_en.md index d63058d8252..6bb61d86e60 100644 --- a/docs-master/keybindings/Keybindings_en.md +++ b/docs-master/keybindings/Keybindings_en.md @@ -68,6 +68,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filter the current view by text | | ## Commit summary @@ -115,6 +116,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | View files | | | `` w `` | View worktree options | | | `` / `` | Search the current view by text | | @@ -158,6 +160,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filter the current view by text | | ## Input prompt @@ -194,6 +197,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | View commits | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -222,6 +226,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` (fn+down) `` | Scroll up | | | `` `` | Switch view | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Search the current view by text | | ## Main panel (patch building) @@ -286,6 +292,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | View commits | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -305,6 +312,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | View commits | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -327,6 +335,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` `` | Switch view | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Search the current view by text | | ## Stash @@ -339,6 +349,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` n `` | New branch | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. | | `` r `` | Rename stash | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | View files | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -354,6 +365,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` a `` | Show/cycle all branch logs | | | `` A `` | Show/cycle all branch logs (reverse) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | ## Sub-commits @@ -371,6 +383,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | View files | | | `` w `` | View worktree options | | | `` / `` | Search the current view by text | | @@ -401,6 +414,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | View commits | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs-master/keybindings/Keybindings_ja.md b/docs-master/keybindings/Keybindings_ja.md index d9b87d747cc..b78355a6459 100644 --- a/docs-master/keybindings/Keybindings_ja.md +++ b/docs-master/keybindings/Keybindings_ja.md @@ -95,6 +95,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 外部差分ツールを開く(git difftool) | | | `` * `` | 現在のブランチのコミットを選択 | | | `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` `` | ファイルを表示 | | | `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストで検索 | | @@ -117,6 +118,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | すべてのファイルを折りたたむ | ファイルツリー内のすべてのディレクトリを折りたたみます | | `` = `` | すべてのファイルを展開 | ファイルツリー内のすべてのディレクトリを展開します | | `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## コミット概要 @@ -142,6 +144,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 外部差分ツールを開く(git difftool) | | | `` * `` | 現在のブランチのコミットを選択 | | | `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` `` | ファイルを表示 | | | `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストで検索 | | @@ -170,6 +173,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` n `` | 新しいブランチ | 選択したスタッシュエントリから新しいブランチを作成します。これは、スタッシュエントリが作成されたコミットをgitがチェックアウトし、そのコミットから新しいブランチを作成した後、スタッシュエントリを追加のコミットとして新しいブランチに適用することで機能します。 | | `` r `` | スタッシュの名前を変更 | | | `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` `` | ファイルを表示 | | | `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | @@ -185,6 +189,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` a `` | ブランチログの表示モードを順に切り替え | | | `` A `` | Show/cycle all branch logs (reverse) | | | `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | ## セカンダリ @@ -192,6 +197,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` `` | ビューを切り替え | 他のビュー(ステージされた変更/ステージされていない変更)に切り替えます。 | | `` `` | サイドパネルに戻る | | +| `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` / `` | 現在のビューをテキストで検索 | | ## タグ @@ -206,6 +213,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | リセット | 選択した項目へのリセットオプション(ソフト/ミックス/ハード)を表示します。各リセットタイプの詳細は次の通りです:
- ソフトリセット:変更を保持し、ステージされた状態にします
- ミックスリセット:変更を保持し、ステージされていない状態にします
- ハードリセット:すべての変更を破棄します | | `` `` | 外部差分ツールを開く(git difftool) | | | `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` `` | コミットを表示 | | | `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | @@ -241,6 +249,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | すべてのファイルを折りたたむ | ファイルツリー内のすべてのディレクトリを折りたたみます | | `` = `` | すべてのファイルを展開 | ファイルツリー内のすべてのディレクトリを展開します | | `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` / `` | 現在のビューをテキストでフィルタリング | | ## メインパネル(ステージング) @@ -305,6 +314,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` (fn+down) `` | 上にスクロール | | | `` `` | ビューを切り替え | 他のビュー(ステージされた変更/ステージされていない変更)に切り替えます。 | | `` `` | サイドパネルに戻る | | +| `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` / `` | 現在のビューをテキストで検索 | | ## メニュー @@ -331,6 +342,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 外部差分ツールを開く(git difftool) | | | `` * `` | 現在のブランチのコミットを選択 | | | `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` `` | コミットを表示 | | | `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | @@ -362,6 +374,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | リセット | 選択した項目へのリセットオプション(ソフト/ミックス/ハード)を表示します。各リセットタイプの詳細は次の通りです:
- ソフトリセット:変更を保持し、ステージされた状態にします
- ミックスリセット:変更を保持し、ステージされていない状態にします
- ハードリセット:すべての変更を破棄します | | `` `` | 外部差分ツールを開く(git difftool) | | | `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` `` | コミットを表示 | | | `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | @@ -393,6 +406,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` u `` | アップストリームオプションを表示 | ブランチのアップストリームに関連するオプションを表示します(例:アップストリームの設定/解除やアップストリームへのリセット)。 | | `` `` | 外部差分ツールを開く(git difftool) | | | `` 0 `` | メインビューにフォーカス | | +| `` 9 `` | Focus secondary view | | | `` `` | コミットを表示 | | | `` w `` | ワークツリーオプションを表示 | | | `` / `` | 現在のビューをテキストでフィルタリング | | diff --git a/docs-master/keybindings/Keybindings_ko.md b/docs-master/keybindings/Keybindings_ko.md index 089543c5fb9..67b1ae62710 100644 --- a/docs-master/keybindings/Keybindings_ko.md +++ b/docs-master/keybindings/Keybindings_ko.md @@ -73,6 +73,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 커밋 보기 | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -83,6 +84,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` `` | 패널 전환 | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | 검색 시작 | | ## Stash @@ -95,6 +98,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` n `` | 새 브랜치 생성 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. | | `` r `` | Rename stash | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | View selected item's files | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -115,6 +119,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | View selected item's files | | | `` w `` | View worktree options | | | `` / `` | 검색 시작 | | @@ -161,6 +166,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` (fn+down) `` | 위로 스크롤 | | | `` `` | 패널 전환 | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | 검색 시작 | | ## 메인 패널 (Patch Building) @@ -228,6 +235,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 커밋 보기 | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -243,6 +251,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` a `` | Show/cycle all branch logs | | | `` A `` | Show/cycle all branch logs (reverse) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | ## 서브모듈 @@ -285,6 +294,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | View reset options | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 커밋 보기 | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -327,6 +337,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | View selected item's files | | | `` w `` | View worktree options | | | `` / `` | 검색 시작 | | @@ -349,6 +360,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filter the current view by text | | ## 커밋메시지 @@ -370,6 +382,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | 초기화 | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 커밋 보기 | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -405,6 +418,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filter the current view by text | | ## 확인 패널 diff --git a/docs-master/keybindings/Keybindings_nl.md b/docs-master/keybindings/Keybindings_nl.md index 1715c597efc..24dde3d47dc 100644 --- a/docs-master/keybindings/Keybindings_nl.md +++ b/docs-master/keybindings/Keybindings_nl.md @@ -81,6 +81,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filter the current view by text | | ## Bevestigingspaneel @@ -118,6 +119,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Bekijk commits | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -147,6 +149,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filter the current view by text | | ## Commits @@ -187,6 +190,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Bekijk gecommite bestanden | | | `` w `` | View worktree options | | | `` / `` | Start met zoeken | | @@ -230,6 +234,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` (fn+down) `` | Scroll omhoog | | | `` `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Start met zoeken | | ## Patch bouwen @@ -264,6 +270,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Bekijk commits | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -283,6 +290,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | Bekijk reset opties | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Bekijk commits | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -305,6 +313,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` `` | Ga naar een ander paneel | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Start met zoeken | | ## Staging @@ -339,6 +349,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` n `` | Nieuwe branch | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. | | `` r `` | Rename stash | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Bekijk gecommite bestanden | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -354,6 +365,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` a `` | Show/cycle all branch logs | | | `` A `` | Show/cycle all branch logs (reverse) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | ## Sub-commits @@ -371,6 +383,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Bekijk gecommite bestanden | | | `` w `` | View worktree options | | | `` / `` | Start met zoeken | | @@ -401,6 +414,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Bekijk commits | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs-master/keybindings/Keybindings_pl.md b/docs-master/keybindings/Keybindings_pl.md index b032a660604..77475fea4ab 100644 --- a/docs-master/keybindings/Keybindings_pl.md +++ b/docs-master/keybindings/Keybindings_pl.md @@ -88,6 +88,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Wyświetl pliki | | | `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Szukaj w bieżącym widoku po tekście | | @@ -98,6 +99,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Szukaj w bieżącym widoku po tekście | | ## Drzewa pracy @@ -126,6 +129,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Pokaż commity | | | `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | @@ -180,6 +184,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` u `` | Pokaż opcje upstream | Pokaż opcje dotyczące upstream gałęzi, np. ustawianie/usuwanie upstream i resetowanie do upstream. | | `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Pokaż commity | | | `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | @@ -200,6 +205,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` (fn+down) `` | Przewiń w górę | | | `` `` | Przełącz widok | Przełącz na inny widok (zatwierdzone/niezatwierdzone zmiany). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Szukaj w bieżącym widoku po tekście | | ## Panel główny (scalanie) @@ -279,6 +286,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filtruj bieżący widok po tekście | | ## Pliki commita @@ -299,6 +307,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filtruj bieżący widok po tekście | | ## Podsumowanie commita @@ -318,6 +327,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` n `` | Nowa gałąź | Utwórz nową gałąź z wybranego wpisu schowka. Działa poprzez przełączenie git na commit, na którym wpis schowka został utworzony, tworzenie nowej gałęzi z tego commita, a następnie zastosowanie wpisu schowka do nowej gałęzi jako dodatkowego commita. | | `` r `` | Zmień nazwę schowka | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Wyświetl pliki | | | `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | @@ -333,6 +343,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` a `` | Show/cycle all branch logs | | | `` A `` | Show/cycle all branch logs (reverse) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | ## Sub-commity @@ -350,6 +361,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Wyświetl pliki | | | `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Szukaj w bieżącym widoku po tekście | | @@ -380,6 +392,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. | | `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Pokaż commity | | | `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | @@ -411,6 +424,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | Reset | Wyświetl opcje resetu (miękki/mieszany/twardy) do wybranego elementu. | | `` `` | Otwórz zewnętrzne narzędzie różnic (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Pokaż commity | | | `` w `` | Zobacz opcje drzewa pracy | | | `` / `` | Filtruj bieżący widok po tekście | | diff --git a/docs-master/keybindings/Keybindings_pt.md b/docs-master/keybindings/Keybindings_pt.md index c19619191c8..c0a254e2b00 100644 --- a/docs-master/keybindings/Keybindings_pt.md +++ b/docs-master/keybindings/Keybindings_pt.md @@ -81,6 +81,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Recolher todos os arquivos | Recolher todos os diretórios na árvore de arquivos | | `` = `` | Expandir todos os arquivos | Expandir todos os diretórios na árvore do arquivo | | `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filtrar a visualização atual por texto | | ## Branches locais @@ -110,6 +111,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. | | `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` `` | Ver commits | | | `` w `` | Ver opções da árvore de trabalho | | | `` / `` | Filtrar a visualização atual por texto | | @@ -129,6 +131,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | | `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` `` | Ver commits | | | `` w `` | Ver opções da árvore de trabalho | | | `` / `` | Filtrar a visualização atual por texto | | @@ -151,6 +154,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Recolher todos os arquivos | Recolher todos os diretórios na árvore de arquivos | | `` = `` | Expandir todos os arquivos | Expandir todos os diretórios na árvore do arquivo | | `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filtrar a visualização atual por texto | | ## Commits @@ -191,6 +195,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` `` | Ver arquivos | | | `` w `` | Ver opções da árvore de trabalho | | | `` / `` | Pesquisar na visualização atual por texto | | @@ -207,6 +212,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | Restaurar | Ver opções de redefinição (soft/mixed/hard) para redefinir para o item selecionado. | | `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` `` | Ver commits | | | `` w `` | Ver opções da árvore de trabalho | | | `` / `` | Filtrar a visualização atual por texto | | @@ -234,6 +240,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` (fn+down) `` | Rolar para cima | | | `` `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` / `` | Pesquisar na visualização atual por texto | | ## Painel Principal (preparação) @@ -314,6 +322,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` `` | Ver commits | | | `` w `` | Ver opções da árvore de trabalho | | | `` / `` | Filtrar a visualização atual por texto | | @@ -336,6 +345,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` `` | Mudar de visão | Alternar para outra visão (staged/não processadas alterações). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` / `` | Pesquisar na visualização atual por texto | | ## Stash @@ -348,6 +359,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` n `` | Nova branch | Criar um novo ramo a partir da entrada de lixo selecionada. Isso funciona verificando o commit do qual a entrada de lixo foi criada, criar um novo branch a partir desse commit e, em seguida, aplicar a entrada de lixo ao novo branch como um commit adicional. | | `` r `` | Renomear o stash | | | `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` `` | Ver arquivos | | | `` w `` | Ver opções da árvore de trabalho | | | `` / `` | Filtrar a visualização atual por texto | | @@ -363,6 +375,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` a `` | Mostrar/ciclo todos os logs de filiais | | | `` A `` | Show/cycle all branch logs (reverse) | | | `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | ## Sub-commits @@ -380,6 +393,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Abrir ferramenta de diff externa (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focar visualização principal | | +| `` 9 `` | Focus secondary view | | | `` `` | Ver arquivos | | | `` w `` | Ver opções da árvore de trabalho | | | `` / `` | Pesquisar na visualização atual por texto | | diff --git a/docs-master/keybindings/Keybindings_ru.md b/docs-master/keybindings/Keybindings_ru.md index c802678b3eb..75b4c19173d 100644 --- a/docs-master/keybindings/Keybindings_ru.md +++ b/docs-master/keybindings/Keybindings_ru.md @@ -73,6 +73,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Найти | | ## Главная панель (Индексирование) @@ -105,6 +107,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` (fn+down) `` | Прокрутить вверх | | | `` `` | Переключиться на другую панель (проиндексированные/непроиндексированные изменения) | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Найти | | ## Главная панель (Слияние) @@ -155,6 +159,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Просмотреть коммиты | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -197,6 +202,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Просмотреть файлы выбранного элемента | | | `` w `` | View worktree options | | | `` / `` | Найти | | @@ -228,6 +234,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` u `` | View upstream options | View options relating to the branch's upstream e.g. setting/unsetting the upstream and resetting to the upstream. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Просмотреть коммиты | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -264,6 +271,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | Open external diff tool (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Просмотреть файлы выбранного элемента | | | `` w `` | View worktree options | | | `` / `` | Найти | | @@ -307,6 +315,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filter the current view by text | | ## Статус @@ -320,6 +329,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` a `` | Show/cycle all branch logs | | | `` A `` | Show/cycle all branch logs (reverse) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | ## Теги @@ -333,6 +343,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | Reset | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Просмотреть коммиты | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -352,6 +363,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | Просмотреть параметры сброса | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | Open external diff tool (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Просмотреть коммиты | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | @@ -399,6 +411,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | Filter the current view by text | | ## Хранилище @@ -411,6 +424,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` n `` | Новая ветка | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. | | `` r `` | Переименовать хранилище | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | Просмотреть файлы выбранного элемента | | | `` w `` | View worktree options | | | `` / `` | Filter the current view by text | | diff --git a/docs-master/keybindings/Keybindings_zh-CN.md b/docs-master/keybindings/Keybindings_zh-CN.md index 9cb7d5186a7..2ef3df805b3 100644 --- a/docs-master/keybindings/Keybindings_zh-CN.md +++ b/docs-master/keybindings/Keybindings_zh-CN.md @@ -66,6 +66,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 使用外部差异比较工具(git difftool) | | | `` * `` | 选择当前分支的提交 | | | `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` `` | 查看提交的文件 | | | `` w `` | 查看工作区选项 | | | `` / `` | 开始搜索 | | @@ -110,6 +111,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 使用外部差异比较工具(git difftool) | | | `` * `` | 选择当前分支的提交 | | | `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` `` | 查看提交 | | | `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | @@ -152,6 +154,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 使用外部差异比较工具(git difftool) | | | `` * `` | 选择当前分支的提交 | | | `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` `` | 查看提交的文件 | | | `` w `` | 查看工作区选项 | | | `` / `` | 开始搜索 | | @@ -181,6 +184,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 | | `` = `` | 展开全部文件 | 展开文件树中的全部目录 | | `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` / `` | 通过文本过滤当前视图 | | ## 文件 @@ -214,6 +218,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | 折叠全部文件 | 折叠文件树中的全部目录 | | `` = `` | 展开全部文件 | 展开文件树中的全部目录 | | `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` / `` | 通过文本过滤当前视图 | | ## 本地分支 @@ -243,6 +248,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` u `` | 查看上游选项 | 查看与分支上游相关的选项,例如设置/取消设置上游和重置为上游。 | | `` `` | 使用外部差异比较工具(git difftool) | | | `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` `` | 查看提交 | | | `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | @@ -275,6 +281,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | 重置 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | | `` `` | 使用外部差异比较工具(git difftool) | | | `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` `` | 查看提交 | | | `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | @@ -285,6 +292,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` `` | 切换到其他面板 | 切换到其他视图(已暂存/未暂存的变更) | | `` `` | 退出回到侧边面板 | | +| `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` / `` | 开始搜索 | | ## 正在合并 @@ -333,6 +342,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` (fn+down) `` | 向上滚动 | | | `` `` | 切换到其他面板 | 切换到其他视图(已暂存/未暂存的变更) | | `` `` | 退出回到侧边面板 | | +| `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` / `` | 开始搜索 | | ## 状态 @@ -346,6 +357,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` a `` | 显示/循环所有分支日志 | | | `` A `` | 显示/循环所有分支日志(反向) | | | `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | ## 确认面板 @@ -373,6 +385,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` n `` | 新分支 | 从选定的贮藏项创建一个新分支。这是通过 git 检查创建贮藏项的提交,从该提交创建一个新分支,然后将贮藏项作为附加提交应用到新分支来实现的。 | | `` r `` | 重命名贮藏 | | | `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` `` | 查看提交的文件 | | | `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | @@ -411,6 +424,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | 查看重置选项 | 查看重置选项 (soft/mixed/hard) 用于重置到选择项 | | `` `` | 使用外部差异比较工具(git difftool) | | | `` 0 `` | 聚焦主视图 | | +| `` 9 `` | Focus secondary view | | | `` `` | 查看提交 | | | `` w `` | 查看工作区选项 | | | `` / `` | 通过文本过滤当前视图 | | diff --git a/docs-master/keybindings/Keybindings_zh-TW.md b/docs-master/keybindings/Keybindings_zh-TW.md index d6526b5b2b6..e5acccbf76b 100644 --- a/docs-master/keybindings/Keybindings_zh-TW.md +++ b/docs-master/keybindings/Keybindings_zh-TW.md @@ -81,6 +81,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` (fn+down) `` | 向上捲動 | | | `` `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | 搜尋 | | ## 主面板(合併) @@ -145,6 +147,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 開啟外部差異工具 (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 檢視所選項目的檔案 | | | `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | @@ -211,6 +214,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 開啟外部差異工具 (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 檢視所選項目的檔案 | | | `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | @@ -240,6 +244,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | 搜尋 | | ## 收藏 (Stash) @@ -252,6 +257,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` n `` | 新分支 | Create a new branch from the selected stash entry. This works by git checking out the commit that the stash entry was created from, creating a new branch from that commit, then applying the stash entry to the new branch as an additional commit. | | `` r `` | 重新命名收藏 | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 檢視所選項目的檔案 | | | `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | @@ -272,6 +278,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` `` | 開啟外部差異工具 (git difftool) | | | `` * `` | Select commits of current branch | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 檢視提交 | | | `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | @@ -303,6 +310,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` u `` | 檢視遠端設定 | 檢視有關遠端分支的設定(例如重設至遠端) | | `` `` | 開啟外部差異工具 (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 檢視提交 | | | `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | @@ -319,6 +327,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | 重設 | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | 開啟外部差異工具 (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 檢視提交 | | | `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | @@ -354,6 +363,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` - `` | Collapse all files | Collapse all directories in the files tree | | `` = `` | Expand all files | Expand all directories in the file tree | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | 搜尋 | | ## 次要 @@ -362,6 +372,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct |-----|--------|-------------| | `` `` | 切換至另一個面板 (已預存/未預存更改) | Switch to other view (staged/unstaged changes). | | `` `` | Exit back to side panel | | +| `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` / `` | 搜尋 | | ## 狀態 @@ -375,6 +387,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` a `` | Show/cycle all branch logs | | | `` A `` | Show/cycle all branch logs (reverse) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | ## 確認面板 @@ -411,6 +424,7 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct | `` g `` | 檢視重設選項 | View reset options (soft/mixed/hard) for resetting onto selected item. | | `` `` | 開啟外部差異工具 (git difftool) | | | `` 0 `` | Focus main view | | +| `` 9 `` | Focus secondary view | | | `` `` | 檢視提交 | | | `` w `` | 檢視工作目錄選項 | | | `` / `` | 搜尋 | | diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go index cac87ec9157..ab0fd609e93 100644 --- a/pkg/config/user_config.go +++ b/pkg/config/user_config.go @@ -458,23 +458,24 @@ type KeybindingUniversalConfig struct { // 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"` // on Mac - MoveWordRight Keybinding `yaml:"moveWordRight"` // on Mac - BackspaceWord Keybinding `yaml:"backspaceWord"` // on Mac - ForwardDeleteWord Keybinding `yaml:"forwardDeleteWord"` // 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"` // on Mac + PrevBlockAlt2 Keybinding `yaml:"prevBlock-alt2"` + JumpToBlock []Keybinding `yaml:"jumpToBlock"` + FocusMainView Keybinding `yaml:"focusMainView"` + FocusSecondaryView Keybinding `yaml:"focusSecondaryView"` + NextMatch Keybinding `yaml:"nextMatch"` + PrevMatch Keybinding `yaml:"prevMatch"` + StartSearch Keybinding `yaml:"startSearch"` + MoveWordLeft Keybinding `yaml:"moveWordLeft"` // on Mac + MoveWordRight Keybinding `yaml:"moveWordRight"` // on Mac + BackspaceWord Keybinding `yaml:"backspaceWord"` // on Mac + ForwardDeleteWord Keybinding `yaml:"forwardDeleteWord"` // 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"` // on Mac // Deprecated: add the key to `confirmInEditor` instead. ConfirmInEditorAlt Keybinding `yaml:"confirmInEditor-alt"` Remove Keybinding `yaml:"remove"` @@ -973,6 +974,7 @@ func GetDefaultConfigForPlatform(platform string) *UserConfig { NextBlockAlt2: Keybinding{""}, JumpToBlock: []Keybinding{{"1"}, {"2"}, {"3"}, {"4"}, {"5"}}, FocusMainView: Keybinding{"0"}, + FocusSecondaryView: Keybinding{"9"}, NextMatch: Keybinding{"n"}, PrevMatch: Keybinding{"N"}, StartSearch: Keybinding{"/"}, diff --git a/pkg/gui/controllers.go b/pkg/gui/controllers.go index 51e240a5d55..d5b42bc7621 100644 --- a/pkg/gui/controllers.go +++ b/pkg/gui/controllers.go @@ -270,6 +270,8 @@ func (gui *Gui) resetHelpersAndControllers() { gui.State.Contexts.SubCommits, gui.State.Contexts.CommitFiles, gui.State.Contexts.Stash, + gui.State.Contexts.Normal, + gui.State.Contexts.NormalSecondary, } { controllers.AttachControllers(context, controllers.NewSwitchToFocusedMainViewController( common, context, diff --git a/pkg/gui/controllers/switch_to_focused_main_view_controller.go b/pkg/gui/controllers/switch_to_focused_main_view_controller.go index 5606a0bab59..b48c10e8db4 100644 --- a/pkg/gui/controllers/switch_to_focused_main_view_controller.go +++ b/pkg/gui/controllers/switch_to_focused_main_view_controller.go @@ -5,7 +5,7 @@ import ( "github.com/jesseduffield/lazygit/pkg/gui/types" ) -// This controller is for all contexts that can focus their main view. +// This controller is for all contexts that can focus their main or secondary view. var _ types.IController = &SwitchToFocusedMainViewController{} @@ -34,6 +34,12 @@ func (self *SwitchToFocusedMainViewController) GetKeybindings(opts types.Keybind Description: self.c.Tr.FocusMainView, Tag: "global", }, + { + Keys: opts.GetKeys(opts.Config.Universal.FocusSecondaryView), + Handler: self.handleFocusSecondaryView, + Description: self.c.Tr.FocusSecondaryView, + Tag: "global", + }, } return bindings @@ -72,6 +78,13 @@ func (self *SwitchToFocusedMainViewController) handleFocusMainView() error { return self.focusMainView(self.c.Contexts().Normal) } +func (self *SwitchToFocusedMainViewController) handleFocusSecondaryView() error { + if !self.c.State().GetRepoState().GetSplitMainPanel() { + return nil + } + return self.focusMainView(self.c.Contexts().NormalSecondary) +} + func (self *SwitchToFocusedMainViewController) focusMainView(mainViewContext types.Context) error { if context, ok := mainViewContext.(types.ISearchableContext); ok { context.ClearSearchString() diff --git a/pkg/gui/views.go b/pkg/gui/views.go index ecfc0ddcd21..bee4c926409 100644 --- a/pkg/gui/views.go +++ b/pkg/gui/views.go @@ -238,6 +238,7 @@ func (gui *Gui) configureViewProperties() { gui.Views.Stash.TitlePrefix = jumpLabels[4] gui.Views.Main.TitlePrefix = keyToTitlePrefix(gui.c.UserConfig().Keybinding.Universal.FocusMainView) + gui.Views.Secondary.TitlePrefix = keyToTitlePrefix(gui.c.UserConfig().Keybinding.Universal.FocusSecondaryView) } else { gui.Views.Status.TitlePrefix = "" @@ -255,6 +256,7 @@ func (gui *Gui) configureViewProperties() { gui.Views.Stash.TitlePrefix = "" gui.Views.Main.TitlePrefix = "" + gui.Views.Secondary.TitlePrefix = "" } for _, view := range gui.g.Views() { diff --git a/pkg/i18n/english.go b/pkg/i18n/english.go index b52c3f20e26..45edeffc2ec 100644 --- a/pkg/i18n/english.go +++ b/pkg/i18n/english.go @@ -265,6 +265,7 @@ type TranslationSet struct { ExcludeFile string RefreshFiles string FocusMainView string + FocusSecondaryView string Merge string MergeBranchTooltip string RegularMergeFastForward string @@ -1383,6 +1384,7 @@ func EnglishTranslationSet() *TranslationSet { ExcludeFile: `Add to .git/info/exclude`, RefreshFiles: `Refresh files`, FocusMainView: "Focus main view", + FocusSecondaryView: "Focus secondary view", Merge: `Merge`, MergeBranchTooltip: "View options for merging the selected item into the current branch (regular merge, squash merge)", RegularMergeFastForward: "Regular merge (fast-forward)", diff --git a/pkg/integration/tests/test_list.go b/pkg/integration/tests/test_list.go index 2bf2837cdf1..7fa4b30dcad 100644 --- a/pkg/integration/tests/test_list.go +++ b/pkg/integration/tests/test_list.go @@ -466,6 +466,8 @@ var tests = []*components.IntegrationTest{ ui.Accordion, ui.DisableSwitchTabWithPanelJumpKeys, ui.EmptyMenu, + ui.FocusMainViewFromSecondary, + ui.FocusSecondaryView, ui.KeybindingSuggestionsDontCrashOnDisabledBindings, ui.KeybindingSuggestionsWhenSwitchingRepos, ui.ModeSpecificKeybindingSuggestions, diff --git a/pkg/integration/tests/ui/focus_main_view_from_secondary.go b/pkg/integration/tests/ui/focus_main_view_from_secondary.go new file mode 100644 index 00000000000..b0d1c75631b --- /dev/null +++ b/pkg/integration/tests/ui/focus_main_view_from_secondary.go @@ -0,0 +1,53 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FocusMainViewFromSecondary = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Focus the primary main view with its keybinding while the secondary main view is focused", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + // Two separate hunks so we can stage one and leave the other unstaged, + // splitting the main panel into a primary (unstaged) and secondary (staged) view + shell. + CreateFileAndAdd("file1", "line1\nline2\nline3\nline4\nline5\nline6\nline7\nline8\nline9\nline10\n"). + Commit("initial commit"). + UpdateFile("file1", "line1-changed\nline2\nline3\nline4\nline5\nline6\nline7\nline8\nline9\nline10-changed\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // Stage the first hunk so file1 is partially staged and the main panel splits + t.Views().Files(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ). + PressEnter() + + t.Views().Staging(). + IsFocused(). + PressPrimaryAction(). // stage first hunk + PressEscape() + + // Focus the primary main view from the side panel + t.Views().Files(). + IsFocused(). + Press(keys.Universal.FocusMainView) + + // Toggle across to the secondary main view + t.Views().Main(). + IsFocused(). + Press(keys.Universal.TogglePanel) + + // The focus-main-view key returns focus to the primary view from the secondary + t.Views().Secondary(). + IsFocused(). + Press(keys.Universal.FocusMainView) + + t.Views().Main(). + IsFocused() + }, +}) diff --git a/pkg/integration/tests/ui/focus_secondary_view.go b/pkg/integration/tests/ui/focus_secondary_view.go new file mode 100644 index 00000000000..efbd046c7ba --- /dev/null +++ b/pkg/integration/tests/ui/focus_secondary_view.go @@ -0,0 +1,72 @@ +package ui + +import ( + "github.com/jesseduffield/lazygit/pkg/config" + . "github.com/jesseduffield/lazygit/pkg/integration/components" +) + +var FocusSecondaryView = NewIntegrationTest(NewIntegrationTestArgs{ + Description: "Focus the secondary main view with the keybinding and switch between main views", + ExtraCmdArgs: []string{}, + Skip: false, + SetupConfig: func(config *config.AppConfig) {}, + SetupRepo: func(shell *Shell) { + // Two separate hunks so we can stage one and leave the other unstaged + shell. + CreateFileAndAdd("file1", "line1\nline2\nline3\nline4\nline5\nline6\nline7\nline8\nline9\nline10\n"). + Commit("initial commit"). + UpdateFile("file1", "line1-changed\nline2\nline3\nline4\nline5\nline6\nline7\nline8\nline9\nline10-changed\n") + }, + Run: func(t *TestDriver, keys config.KeybindingConfig) { + // No secondary view yet — pressing the focus-secondary key is a no-op + t.Views().Files(). + IsFocused(). + Press(keys.Universal.FocusSecondaryView). + IsFocused() + + // Enter staging view and stage first hunk to create a partially staged file + t.Views().Files(). + IsFocused(). + Lines( + Contains("file1").IsSelected(), + ). + PressEnter() + + t.Views().Staging(). + IsFocused(). + PressPrimaryAction(). // stage first hunk + PressEscape() + + // Back in Files panel with file1 partially staged — split main panel is visible + t.Views().Files(). + IsFocused() + + // Focus secondary view from side panel + t.Views().Files(). + Press(keys.Universal.FocusSecondaryView) + + t.Views().Secondary(). + IsFocused() + + // Switch from secondary to primary main view + t.Views().Secondary(). + Press(keys.Universal.FocusMainView) + + t.Views().Main(). + IsFocused() + + // Switch from primary back to secondary main view + t.Views().Main(). + Press(keys.Universal.FocusSecondaryView) + + t.Views().Secondary(). + IsFocused() + + // Escape back to side panel + t.Views().Secondary(). + PressEscape() + + t.Views().Files(). + IsFocused() + }, +}) diff --git a/schema-master/config.json b/schema-master/config.json index 2e968ba8f95..df52d828cdb 100644 --- a/schema-master/config.json +++ b/schema-master/config.json @@ -2600,6 +2600,20 @@ ], "default": "0" }, + "focusSecondaryView": { + "oneOf": [ + { + "type": "string" + }, + { + "items": { + "type": "string" + }, + "type": "array" + } + ], + "default": "9" + }, "nextMatch": { "oneOf": [ {