refactor to only have one context per view

6 files changed, 96 insertions, 114 deletions

diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
index 13d50012b..fd1b270e5 100644
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@@ -30,13 +30,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## List Panel Navigation
 
 <pre>
-  <kbd>.</kbd>: next page
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
   <kbd>,</kbd>: previous page
+  <kbd>.</kbd>: next page
   <kbd><</kbd>: scroll to top
-  <kbd>></kbd>: scroll to bottom
   <kbd>/</kbd>: start search
-  <kbd>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
+  <kbd>></kbd>: scroll to bottom
   <kbd>]</kbd>: next tab
   <kbd>[</kbd>: previous tab
 </pre>
@@ -163,36 +163,33 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Main Panel (Patch Building)
 
 <pre>
-  <kbd>esc</kbd>: exit line-by-line mode
-  <kbd>o</kbd>: open file
-  <kbd>▲</kbd>: select previous line
-  <kbd>▼</kbd>: select next line
   <kbd>◄</kbd>: select previous hunk
   <kbd>►</kbd>: select next hunk
-  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
-  <kbd>space</kbd>: add/remove line(s) to patch
   <kbd>v</kbd>: toggle drag select
   <kbd>V</kbd>: toggle drag select
   <kbd>a</kbd>: toggle select hunk
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: open file
+  <kbd>e</kbd>: edit file
+  <kbd>space</kbd>: add/remove line(s) to patch
+  <kbd>esc</kbd>: exit custom patch builder
 </pre>
 
 ## Main Panel (Staging)
 
 <pre>
-  <kbd>esc</kbd>: return to files panel
-  <kbd>space</kbd>: toggle line staged / unstaged
-  <kbd>d</kbd>: delete change (git reset)
-  <kbd>tab</kbd>: switch to other panel
-  <kbd>o</kbd>: open file
-  <kbd>▲</kbd>: select previous line
-  <kbd>▼</kbd>: select next line
   <kbd>◄</kbd>: select previous hunk
   <kbd>►</kbd>: select next hunk
-  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
-  <kbd>e</kbd>: edit file
   <kbd>v</kbd>: toggle drag select
   <kbd>V</kbd>: toggle drag select
   <kbd>a</kbd>: toggle select hunk
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: open file
+  <kbd>e</kbd>: edit file
+  <kbd>esc</kbd>: return to files panel
+  <kbd>tab</kbd>: switch to other panel (staged/unstaged changes)
+  <kbd>space</kbd>: toggle line staged / unstaged
+  <kbd>d</kbd>: delete change (git reset)
   <kbd>E</kbd>: edit hunk
 </pre>
 
diff --git a/docs/keybindings/Keybindings_ja.md b/docs/keybindings/Keybindings_ja.md
index b001869fd..26dde2c69 100644
--- a/docs/keybindings/Keybindings_ja.md
+++ b/docs/keybindings/Keybindings_ja.md
@@ -30,13 +30,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 一覧パネルの操作
 
 <pre>
-  <kbd>.</kbd>: 次のページ
+  <kbd>H</kbd>: 左スクロール
+  <kbd>L</kbd>: 右スクロール
   <kbd>,</kbd>: 前のページ
+  <kbd>.</kbd>: 次のページ
   <kbd><</kbd>: 最上部までスクロール
-  <kbd>></kbd>: 最下部までスクロール
   <kbd>/</kbd>: 検索を開始
-  <kbd>H</kbd>: 左スクロール
-  <kbd>L</kbd>: 右スクロール
+  <kbd>></kbd>: 最下部までスクロール
   <kbd>]</kbd>: 次のタブ
   <kbd>[</kbd>: 前のタブ
 </pre>
@@ -222,36 +222,33 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## メインパネル (Patch Building)
 
 <pre>
-  <kbd>esc</kbd>: line-by-lineモードを終了
-  <kbd>o</kbd>: ファイルを開く
-  <kbd>▲</kbd>: 前の行を選択
-  <kbd>▼</kbd>: 次の行を選択
   <kbd>◄</kbd>: 前のhunkを選択
   <kbd>►</kbd>: 次のhunkを選択
-  <kbd>ctrl+o</kbd>: 選択されたテキストをクリップボードにコピー
-  <kbd>space</kbd>: 行をパッチに追加/削除
   <kbd>v</kbd>: 範囲選択を切り替え
   <kbd>V</kbd>: 範囲選択を切り替え
   <kbd>a</kbd>: hunk選択を切り替え
+  <kbd>ctrl+o</kbd>: 選択されたテキストをクリップボードにコピー
+  <kbd>o</kbd>: ファイルを開く
+  <kbd>e</kbd>: ファイルを編集
+  <kbd>space</kbd>: 行をパッチに追加/削除
+  <kbd>esc</kbd>: exit custom patch builder
 </pre>
 
 ## メインパネル (Staging)
 
 <pre>
-  <kbd>esc</kbd>: ファイル一覧に戻る
-  <kbd>space</kbd>: 選択行をステージ/アンステージ
-  <kbd>d</kbd>: 変更を削除 (git reset)
-  <kbd>tab</kbd>: パネルを切り替え
-  <kbd>o</kbd>: ファイルを開く
-  <kbd>▲</kbd>: 前の行を選択
-  <kbd>▼</kbd>: 次の行を選択
   <kbd>◄</kbd>: 前のhunkを選択
   <kbd>►</kbd>: 次のhunkを選択
-  <kbd>ctrl+o</kbd>: 選択されたテキストをクリップボードにコピー
-  <kbd>e</kbd>: ファイルを編集
   <kbd>v</kbd>: 範囲選択を切り替え
   <kbd>V</kbd>: 範囲選択を切り替え
   <kbd>a</kbd>: hunk選択を切り替え
+  <kbd>ctrl+o</kbd>: 選択されたテキストをクリップボードにコピー
+  <kbd>o</kbd>: ファイルを開く
+  <kbd>e</kbd>: ファイルを編集
+  <kbd>esc</kbd>: ファイル一覧に戻る
+  <kbd>tab</kbd>: パネルを切り替え
+  <kbd>space</kbd>: 選択行をステージ/アンステージ
+  <kbd>d</kbd>: 変更を削除 (git reset)
   <kbd>E</kbd>: edit hunk
 </pre>
 
diff --git a/docs/keybindings/Keybindings_ko.md b/docs/keybindings/Keybindings_ko.md
index c23e89f52..040366e7b 100644
--- a/docs/keybindings/Keybindings_ko.md
+++ b/docs/keybindings/Keybindings_ko.md
@@ -30,13 +30,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## List Panel Navigation
 
 <pre>
-  <kbd>.</kbd>: 다음 페이지
+  <kbd>H</kbd>: 우 스크롤
+  <kbd>L</kbd>: 좌 스크롤
   <kbd>,</kbd>: 이전 페이지
+  <kbd>.</kbd>: 다음 페이지
   <kbd><</kbd>: 맨 위로 스크롤 
-  <kbd>></kbd>: 맨 아래로 스크롤 
   <kbd>/</kbd>: 검색 시작
-  <kbd>H</kbd>: 우 스크롤
-  <kbd>L</kbd>: 좌 스크롤
+  <kbd>></kbd>: 맨 아래로 스크롤 
   <kbd>]</kbd>: 이전 탭
   <kbd>[</kbd>: 다음 탭
 </pre>
@@ -107,36 +107,33 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 메인 패널 (Patch Building)
 
 <pre>
-  <kbd>esc</kbd>: line-by-line 모드 종료
-  <kbd>o</kbd>: 파일 닫기
-  <kbd>▲</kbd>: 이전 줄 선택
-  <kbd>▼</kbd>: 다음 줄 선택
   <kbd>◄</kbd>: 이전 hunk를 선택
   <kbd>►</kbd>: 다음 hunk를 선택
-  <kbd>ctrl+o</kbd>: 선택한 텍스트를 클립보드에 복사
-  <kbd>space</kbd>: line(s)을 패치에 추가/삭제
   <kbd>v</kbd>: 드래그 선택 전환
   <kbd>V</kbd>: 드래그 선택 전환
   <kbd>a</kbd>: toggle select hunk
+  <kbd>ctrl+o</kbd>: 선택한 텍스트를 클립보드에 복사
+  <kbd>o</kbd>: 파일 닫기
+  <kbd>e</kbd>: 파일 편집
+  <kbd>space</kbd>: line(s)을 패치에 추가/삭제
+  <kbd>esc</kbd>: exit custom patch builder
 </pre>
 
 ## 메인 패널 (Staging)
 
 <pre>
-  <kbd>esc</kbd>: 파일 목록으로 돌아가기
-  <kbd>space</kbd>: 선택한 행을 staged / unstaged
-  <kbd>d</kbd>: 변경을 삭제 (git reset)
-  <kbd>tab</kbd>: 패널 전환
-  <kbd>o</kbd>: 파일 닫기
-  <kbd>▲</kbd>: 이전 줄 선택
-  <kbd>▼</kbd>: 다음 줄 선택
   <kbd>◄</kbd>: 이전 hunk를 선택
   <kbd>►</kbd>: 다음 hunk를 선택
-  <kbd>ctrl+o</kbd>: 선택한 텍스트를 클립보드에 복사
-  <kbd>e</kbd>: 파일 편집
   <kbd>v</kbd>: 드래그 선택 전환
   <kbd>V</kbd>: 드래그 선택 전환
   <kbd>a</kbd>: toggle select hunk
+  <kbd>ctrl+o</kbd>: 선택한 텍스트를 클립보드에 복사
+  <kbd>o</kbd>: 파일 닫기
+  <kbd>e</kbd>: 파일 편집
+  <kbd>esc</kbd>: 파일 목록으로 돌아가기
+  <kbd>tab</kbd>: 패널 전환
+  <kbd>space</kbd>: 선택한 행을 staged / unstaged
+  <kbd>d</kbd>: 변경을 삭제 (git reset)
   <kbd>E</kbd>: edit hunk
 </pre>
 
diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
index 26e861314..f9f6aff55 100644
--- a/docs/keybindings/Keybindings_nl.md
+++ b/docs/keybindings/Keybindings_nl.md
@@ -30,13 +30,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Lijstpaneel Navigatie
 
 <pre>
-  <kbd>.</kbd>: volgende pagina
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
   <kbd>,</kbd>: vorige pagina
+  <kbd>.</kbd>: volgende pagina
   <kbd><</kbd>: scroll naar boven
-  <kbd>></kbd>: scroll naar beneden
   <kbd>/</kbd>: start met zoeken
-  <kbd>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
+  <kbd>></kbd>: scroll naar beneden
   <kbd>]</kbd>: volgende tabblad
   <kbd>[</kbd>: vorige tabblad
 </pre>
@@ -163,17 +163,16 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Patch Bouwen
 
 <pre>
-  <kbd>esc</kbd>: sluit lijn-bij-lijn modus
-  <kbd>o</kbd>: open bestand
-  <kbd>▲</kbd>: selecteer de vorige lijn
-  <kbd>▼</kbd>: selecteer de volgende lijn
   <kbd>◄</kbd>: selecteer de vorige hunk
   <kbd>►</kbd>: selecteer de volgende hunk
-  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
-  <kbd>space</kbd>: voeg toe/verwijder lijn(en) in patch
   <kbd>v</kbd>: toggle drag selecteer
   <kbd>V</kbd>: toggle drag selecteer
   <kbd>a</kbd>: toggle selecteer hunk
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: open bestand
+  <kbd>e</kbd>: verander bestand
+  <kbd>space</kbd>: voeg toe/verwijder lijn(en) in patch
+  <kbd>esc</kbd>: sluit lijn-bij-lijn modus
 </pre>
 
 ## Reflog
@@ -217,20 +216,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Staging
 
 <pre>
-  <kbd>esc</kbd>: ga terug naar het bestanden paneel
-  <kbd>space</kbd>: toggle lijnen staged / unstaged
-  <kbd>d</kbd>: verwijdert change (git reset)
-  <kbd>tab</kbd>: ga naar een ander paneel
-  <kbd>o</kbd>: open bestand
-  <kbd>▲</kbd>: selecteer de vorige lijn
-  <kbd>▼</kbd>: selecteer de volgende lijn
   <kbd>◄</kbd>: selecteer de vorige hunk
   <kbd>►</kbd>: selecteer de volgende hunk
-  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
-  <kbd>e</kbd>: verander bestand
   <kbd>v</kbd>: toggle drag selecteer
   <kbd>V</kbd>: toggle drag selecteer
   <kbd>a</kbd>: toggle selecteer hunk
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: open bestand
+  <kbd>e</kbd>: verander bestand
+  <kbd>esc</kbd>: ga terug naar het bestanden paneel
+  <kbd>tab</kbd>: ga naar een ander paneel
+  <kbd>space</kbd>: toggle lijnen staged / unstaged
+  <kbd>d</kbd>: verwijdert change (git reset)
   <kbd>E</kbd>: edit hunk
 </pre>
 
diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
index 53648368e..38f67182e 100644
--- a/docs/keybindings/Keybindings_pl.md
+++ b/docs/keybindings/Keybindings_pl.md
@@ -30,13 +30,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## List Panel Navigation
 
 <pre>
-  <kbd>.</kbd>: next page
+  <kbd>H</kbd>: scroll left
+  <kbd>L</kbd>: scroll right
   <kbd>,</kbd>: previous page
+  <kbd>.</kbd>: next page
   <kbd><</kbd>: scroll to top
-  <kbd>></kbd>: scroll to bottom
   <kbd>/</kbd>: start search
-  <kbd>H</kbd>: scroll left
-  <kbd>L</kbd>: scroll right
+  <kbd>></kbd>: scroll to bottom
   <kbd>]</kbd>: next tab
   <kbd>[</kbd>: previous tab
 </pre>
@@ -99,17 +99,16 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Main Panel (Patch Building)
 
 <pre>
-  <kbd>esc</kbd>: wyście z trybu "linia po linii"
-  <kbd>o</kbd>: otwórz plik
-  <kbd>▲</kbd>: poprzednia linia
-  <kbd>▼</kbd>: następna linia
   <kbd>◄</kbd>: poprzedni kawałek
   <kbd>►</kbd>: następny kawałek
-  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
-  <kbd>space</kbd>: add/remove line(s) to patch
   <kbd>v</kbd>: toggle drag select
   <kbd>V</kbd>: toggle drag select
   <kbd>a</kbd>: toggle select hunk
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: otwórz plik
+  <kbd>e</kbd>: edytuj plik
+  <kbd>space</kbd>: add/remove line(s) to patch
+  <kbd>esc</kbd>: wyście z trybu "linia po linii"
 </pre>
 
 ## Pliki
@@ -156,20 +155,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Poczekalnia
 
 <pre>
-  <kbd>esc</kbd>: wróć do panelu plików
-  <kbd>space</kbd>: toggle line staged / unstaged
-  <kbd>d</kbd>: delete change (git reset)
-  <kbd>tab</kbd>: switch to other panel
-  <kbd>o</kbd>: otwórz plik
-  <kbd>▲</kbd>: poprzednia linia
-  <kbd>▼</kbd>: następna linia
   <kbd>◄</kbd>: poprzedni kawałek
   <kbd>►</kbd>: następny kawałek
-  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
-  <kbd>e</kbd>: edytuj plik
   <kbd>v</kbd>: toggle drag select
   <kbd>V</kbd>: toggle drag select
   <kbd>a</kbd>: toggle select hunk
+  <kbd>ctrl+o</kbd>: copy the selected text to the clipboard
+  <kbd>o</kbd>: otwórz plik
+  <kbd>e</kbd>: edytuj plik
+  <kbd>esc</kbd>: wróć do panelu plików
+  <kbd>tab</kbd>: switch to other panel (staged/unstaged changes)
+  <kbd>space</kbd>: toggle line staged / unstaged
+  <kbd>d</kbd>: delete change (git reset)
   <kbd>E</kbd>: edit hunk
 </pre>
 
diff --git a/docs/keybindings/Keybindings_zh.md b/docs/keybindings/Keybindings_zh.md
index bc47efbab..511ea5934 100644
--- a/docs/keybindings/Keybindings_zh.md
+++ b/docs/keybindings/Keybindings_zh.md
@@ -30,13 +30,13 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 列表面板导航
 
 <pre>
-  <kbd>.</kbd>: 下一页
+  <kbd>H</kbd>: 向左滚动
+  <kbd>L</kbd>: 向右滚动
   <kbd>,</kbd>: 上一页
+  <kbd>.</kbd>: 下一页
   <kbd><</kbd>: 滚动到顶部
-  <kbd>></kbd>: 滚动到底部
   <kbd>/</kbd>: 开始搜索
-  <kbd>H</kbd>: 向左滚动
-  <kbd>L</kbd>: 向右滚动
+  <kbd>></kbd>: 滚动到底部
   <kbd>]</kbd>: 下一个标签
   <kbd>[</kbd>: 上一个标签
 </pre>
@@ -183,17 +183,16 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 构建补丁中
 
 <pre>
-  <kbd>esc</kbd>: 退出逐行模式
-  <kbd>o</kbd>: 打开文件
-  <kbd>▲</kbd>: 选择上一行
-  <kbd>▼</kbd>: 选择下一行
   <kbd>◄</kbd>: 选择上一个区块
   <kbd>►</kbd>: 选择下一个区块
-  <kbd>ctrl+o</kbd>: 将选中文本复制到剪贴板
-  <kbd>space</kbd>: 添加/移除 行到补丁
   <kbd>v</kbd>: 切换拖动选择
   <kbd>V</kbd>: 切换拖动选择
   <kbd>a</kbd>: 切换选择区块
+  <kbd>ctrl+o</kbd>: 将选中文本复制到剪贴板
+  <kbd>o</kbd>: 打开文件
+  <kbd>e</kbd>: 编辑文件
+  <kbd>space</kbd>: 添加/移除 行到补丁
+  <kbd>esc</kbd>: 退出逐行模式
 </pre>
 
 ## 标签页面
@@ -226,20 +225,18 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 正在暂存
 
 <pre>
-  <kbd>esc</kbd>: 返回文件面板
-  <kbd>space</kbd>: 切换行暂存状态
-  <kbd>d</kbd>: 取消变更 (git reset)
-  <kbd>tab</kbd>: 切换到其他面板
-  <kbd>o</kbd>: 打开文件
-  <kbd>▲</kbd>: 选择上一行
-  <kbd>▼</kbd>: 选择下一行
   <kbd>◄</kbd>: 选择上一个区块
   <kbd>►</kbd>: 选择下一个区块
-  <kbd>ctrl+o</kbd>: 将选中文本复制到剪贴板
-  <kbd>e</kbd>: 编辑文件
   <kbd>v</kbd>: 切换拖动选择
   <kbd>V</kbd>: 切换拖动选择
   <kbd>a</kbd>: 切换选择区块
+  <kbd>ctrl+o</kbd>: 将选中文本复制到剪贴板
+  <kbd>o</kbd>: 打开文件
+  <kbd>e</kbd>: 编辑文件
+  <kbd>esc</kbd>: 返回文件面板
+  <kbd>tab</kbd>: 切换到其他面板
+  <kbd>space</kbd>: 切换行暂存状态
+  <kbd>d</kbd>: 取消变更 (git reset)
   <kbd>E</kbd>: edit hunk
 </pre>