Make arrows consistent (#2501)

2025-02-03 13:21:56 +02:00 · 2023-03-18 01:32:44 +01:00 · 2023-03-18 01:32:44 +01:00 · 5c8bc790ff
commit 5c8bc790ff
parent b5d612e6d6
9 changed files with 41 additions and 41 deletions
--- a/docs/keybindings/Keybindings_en.md
+++ b/docs/keybindings/Keybindings_en.md
@ -143,8 +143,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 <pre>
  <kbd>e</kbd>: edit file
  <kbd>o</kbd>: open file
-  <kbd>◄</kbd>: select previous conflict
-  <kbd>►</kbd>: select next conflict
+  <kbd>◀</kbd>: select previous conflict
+  <kbd>▶</kbd>: select next conflict
  <kbd>▲</kbd>: select previous hunk
  <kbd>▼</kbd>: select next hunk
  <kbd>z</kbd>: undo
@ -164,8 +164,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Main Panel (Patch Building)

 <pre>
-  <kbd>◄</kbd>: select previous hunk
-  <kbd>►</kbd>: select next hunk
+  <kbd>◀</kbd>: select previous hunk
+  <kbd>▶</kbd>: select next hunk
  <kbd>v</kbd>: toggle drag select
  <kbd>V</kbd>: toggle drag select
  <kbd>a</kbd>: toggle select hunk
@ -179,8 +179,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Main Panel (Staging)

 <pre>
-  <kbd>◄</kbd>: select previous hunk
-  <kbd>►</kbd>: select next hunk
+  <kbd>◀</kbd>: select previous hunk
+  <kbd>▶</kbd>: select next hunk
  <kbd>v</kbd>: toggle drag select
  <kbd>V</kbd>: toggle drag select
  <kbd>a</kbd>: toggle select hunk
--- a/docs/keybindings/Keybindings_ja.md
+++ b/docs/keybindings/Keybindings_ja.md
@ -203,8 +203,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 <pre>
  <kbd>e</kbd>: ファイルを編集
  <kbd>o</kbd>: ファイルを開く
-  <kbd>◄</kbd>: 前のコンフリクトを選択
-  <kbd>►</kbd>: 次のコンフリクトを選択
+  <kbd>◀</kbd>: 前のコンフリクトを選択
+  <kbd>▶</kbd>: 次のコンフリクトを選択
  <kbd>▲</kbd>: 前のhunkを選択
  <kbd>▼</kbd>: 次のhunkを選択
  <kbd>z</kbd>: アンドゥ
@ -224,8 +224,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## メインパネル (Patch Building)

 <pre>
-  <kbd>◄</kbd>: 前のhunkを選択
-  <kbd>►</kbd>: 次のhunkを選択
+  <kbd>◀</kbd>: 前のhunkを選択
+  <kbd>▶</kbd>: 次のhunkを選択
  <kbd>v</kbd>: 範囲選択を切り替え
  <kbd>V</kbd>: 範囲選択を切り替え
  <kbd>a</kbd>: hunk選択を切り替え
@ -239,8 +239,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## メインパネル (Staging)

 <pre>
-  <kbd>◄</kbd>: 前のhunkを選択
-  <kbd>►</kbd>: 次のhunkを選択
+  <kbd>◀</kbd>: 前のhunkを選択
+  <kbd>▶</kbd>: 次のhunkを選択
  <kbd>v</kbd>: 範囲選択を切り替え
  <kbd>V</kbd>: 範囲選択を切り替え
  <kbd>a</kbd>: hunk選択を切り替え
--- a/docs/keybindings/Keybindings_ko.md
+++ b/docs/keybindings/Keybindings_ko.md
@ -88,8 +88,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 <pre>
  <kbd>e</kbd>: 파일 편집
  <kbd>o</kbd>: 파일 닫기
-  <kbd>◄</kbd>: 이전 충돌을 선택
-  <kbd>►</kbd>: 다음 충돌을 선택
+  <kbd>◀</kbd>: 이전 충돌을 선택
+  <kbd>▶</kbd>: 다음 충돌을 선택
  <kbd>▲</kbd>: 이전 hunk를 선택
  <kbd>▼</kbd>: 다음 hunk를 선택
  <kbd>z</kbd>: 되돌리기
@ -109,8 +109,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 메인 패널 (Patch Building)

 <pre>
-  <kbd>◄</kbd>: 이전 hunk를 선택
-  <kbd>►</kbd>: 다음 hunk를 선택
+  <kbd>◀</kbd>: 이전 hunk를 선택
+  <kbd>▶</kbd>: 다음 hunk를 선택
  <kbd>v</kbd>: 드래그 선택 전환
  <kbd>V</kbd>: 드래그 선택 전환
  <kbd>a</kbd>: toggle select hunk
@ -124,8 +124,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 메인 패널 (Staging)

 <pre>
-  <kbd>◄</kbd>: 이전 hunk를 선택
-  <kbd>►</kbd>: 다음 hunk를 선택
+  <kbd>◀</kbd>: 이전 hunk를 선택
+  <kbd>▶</kbd>: 다음 hunk를 선택
  <kbd>v</kbd>: 드래그 선택 전환
  <kbd>V</kbd>: 드래그 선택 전환
  <kbd>a</kbd>: toggle select hunk
--- a/docs/keybindings/Keybindings_nl.md
+++ b/docs/keybindings/Keybindings_nl.md
@ -143,8 +143,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 <pre>
  <kbd>e</kbd>: verander bestand
  <kbd>o</kbd>: open bestand
-  <kbd>◄</kbd>: selecteer voorgaand conflict
-  <kbd>►</kbd>: selecteer volgende conflict
+  <kbd>◀</kbd>: selecteer voorgaand conflict
+  <kbd>▶</kbd>: selecteer volgende conflict
  <kbd>▲</kbd>: selecteer bovenste hunk
  <kbd>▼</kbd>: selecteer onderste hunk
  <kbd>z</kbd>: ongedaan maken
@ -164,8 +164,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Patch Bouwen

 <pre>
-  <kbd>◄</kbd>: selecteer de vorige hunk
-  <kbd>►</kbd>: selecteer de volgende hunk
+  <kbd>◀</kbd>: selecteer de vorige hunk
+  <kbd>▶</kbd>: selecteer de volgende hunk
  <kbd>v</kbd>: toggle drag selecteer
  <kbd>V</kbd>: toggle drag selecteer
  <kbd>a</kbd>: toggle selecteer hunk
@ -218,8 +218,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Staging

 <pre>
-  <kbd>◄</kbd>: selecteer de vorige hunk
-  <kbd>►</kbd>: selecteer de volgende hunk
+  <kbd>◀</kbd>: selecteer de vorige hunk
+  <kbd>▶</kbd>: selecteer de volgende hunk
  <kbd>v</kbd>: toggle drag selecteer
  <kbd>V</kbd>: toggle drag selecteer
  <kbd>a</kbd>: toggle selecteer hunk
--- a/docs/keybindings/Keybindings_pl.md
+++ b/docs/keybindings/Keybindings_pl.md
@ -101,8 +101,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Main Panel (Patch Building)

 <pre>
-  <kbd>◄</kbd>: poprzedni kawałek
-  <kbd>►</kbd>: następny kawałek
+  <kbd>◀</kbd>: poprzedni kawałek
+  <kbd>▶</kbd>: następny kawałek
  <kbd>v</kbd>: toggle drag select
  <kbd>V</kbd>: toggle drag select
  <kbd>a</kbd>: toggle select hunk
@ -156,8 +156,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## Poczekalnia

 <pre>
-  <kbd>◄</kbd>: poprzedni kawałek
-  <kbd>►</kbd>: następny kawałek
+  <kbd>◀</kbd>: poprzedni kawałek
+  <kbd>▶</kbd>: następny kawałek
  <kbd>v</kbd>: toggle drag select
  <kbd>V</kbd>: toggle drag select
  <kbd>a</kbd>: toggle select hunk
@ -218,8 +218,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 <pre>
  <kbd>e</kbd>: edytuj plik
  <kbd>o</kbd>: otwórz plik
-  <kbd>◄</kbd>: poprzedni konflikt
-  <kbd>►</kbd>: następny konflikt
+  <kbd>◀</kbd>: poprzedni konflikt
+  <kbd>▶</kbd>: następny konflikt
  <kbd>▲</kbd>: wybierz poprzedni kawałek
  <kbd>▼</kbd>: wybierz następny kawałek
  <kbd>z</kbd>: cofnij
--- a/docs/keybindings/Keybindings_zh.md
+++ b/docs/keybindings/Keybindings_zh.md
@ -184,8 +184,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 构建补丁中

 <pre>
-  <kbd>◄</kbd>: 选择上一个区块
-  <kbd>►</kbd>: 选择下一个区块
+  <kbd>◀</kbd>: 选择上一个区块
+  <kbd>▶</kbd>: 选择下一个区块
  <kbd>v</kbd>: 切换拖动选择
  <kbd>V</kbd>: 切换拖动选择
  <kbd>a</kbd>: 切换选择区块
@ -212,8 +212,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 <pre>
  <kbd>e</kbd>: 编辑文件
  <kbd>o</kbd>: 打开文件
-  <kbd>◄</kbd>: 选择上一个冲突
-  <kbd>►</kbd>: 选择下一个冲突
+  <kbd>◀</kbd>: 选择上一个冲突
+  <kbd>▶</kbd>: 选择下一个冲突
  <kbd>▲</kbd>: 选择顶部块
  <kbd>▼</kbd>: 选择底部块
  <kbd>z</kbd>: 撤销
@ -226,8 +226,8 @@ _This file is auto-generated. To update, make the changes in the pkg/i18n direct
 ## 正在暂存

 <pre>
-  <kbd>◄</kbd>: 选择上一个区块
-  <kbd>►</kbd>: 选择下一个区块
+  <kbd>◀</kbd>: 选择上一个区块
+  <kbd>▶</kbd>: 选择下一个区块
  <kbd>v</kbd>: 切换拖动选择
  <kbd>V</kbd>: 切换拖动选择
  <kbd>a</kbd>: 切换选择区块
--- a/pkg/gui/keybindings/keybindings.go
+++ b/pkg/gui/keybindings/keybindings.go
@ -32,8 +32,8 @@ var keyMapReversed = map[gocui.Key]string{
 	gocui.KeyPgdn:        "pgdown",
 	gocui.KeyArrowUp:     "▲",
 	gocui.KeyArrowDown:   "▼",
-	gocui.KeyArrowLeft:   "◄",
-	gocui.KeyArrowRight:  "►",
+	gocui.KeyArrowLeft:   "◀",
+	gocui.KeyArrowRight:  "▶",
 	gocui.KeyTab:         "tab", // ctrl+i
 	gocui.KeyBacktab:     "shift+tab",
 	gocui.KeyEnter:       "enter", // ctrl+m
--- a/pkg/gui/presentation/files.go
+++ b/pkg/gui/presentation/files.go
@ -14,7 +14,7 @@ import (

 const (
 	EXPANDED_ARROW  = "▼"
-	COLLAPSED_ARROW = "►"
+	COLLAPSED_ARROW = "▶"
 )

 // keeping these here as individual constants in case later on people want the old tree shape
--- a/pkg/gui/presentation/files_test.go
+++ b/pkg/gui/presentation/files_test.go
@ -53,7 +53,7 @@ func TestRenderFileTree(t *testing.T) {
 			},
 			expected: toStringSlice(
 				`
-► dir1
+▶ dir1
 ▼ dir2
  ▼ dir2
     M file3
@ -112,7 +112,7 @@ func TestRenderCommitFileTree(t *testing.T) {
 			},
 			expected: toStringSlice(
 				`
-► dir1
+▶ dir1
 ▼ dir2
  ▼ dir2
    D file3