Skip to content

Commit 9e7de8b

Browse files
committed
keys: Add a new help category for opening compose box.
Regroup key bindings that were previously categorized under message actions and the general category. Hotkeys document regenerated.
1 parent d46b6d8 commit 9e7de8b

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

docs/hotkeys.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
|Show/hide Help Menu|<kbd>?</kbd>|
99
|Show/hide Markdown Help Menu|<kbd>Meta</kbd> + <kbd>m</kbd>|
1010
|Show/hide About Menu|<kbd>Meta</kbd> + <kbd>?</kbd>|
11-
|Open draft message saved in this session|<kbd>d</kbd>|
1211
|Copy information from About Menu to clipboard|<kbd>c</kbd>|
1312
|Redraw screen|<kbd>Ctrl</kbd> + <kbd>l</kbd>|
1413
|Quit|<kbd>Ctrl</kbd> + <kbd>c</kbd>|
@@ -47,13 +46,7 @@
4746
## Message actions
4847
|Command|Key Combination|
4948
| :--- | :---: |
50-
|Reply to the current message|<kbd>r</kbd> / <kbd>Enter</kbd>|
51-
|Reply mentioning the sender of the current message|<kbd>@</kbd>|
52-
|Reply quoting the current message text|<kbd>></kbd>|
53-
|Reply directly to the sender of the current message|<kbd>R</kbd>|
5449
|Edit message's content or topic|<kbd>e</kbd>|
55-
|New message to a stream|<kbd>c</kbd>|
56-
|New message to a person or group of people|<kbd>x</kbd>|
5750
|Show/hide emoji picker for current message|<kbd>:</kbd>|
5851
|Narrow to the stream of the current message|<kbd>s</kbd>|
5952
|Narrow to the topic of the current message|<kbd>S</kbd>|
@@ -77,6 +70,17 @@
7770
|Show/hide stream members (from stream information)|<kbd>m</kbd>|
7871
|Copy stream email to clipboard (from stream information)|<kbd>c</kbd>|
7972

73+
## Begin composing a message
74+
|Command|Key Combination|
75+
| :--- | :---: |
76+
|Open draft message saved in this session|<kbd>d</kbd>|
77+
|Reply to the current message|<kbd>r</kbd> / <kbd>Enter</kbd>|
78+
|Reply mentioning the sender of the current message|<kbd>@</kbd>|
79+
|Reply quoting the current message text|<kbd>></kbd>|
80+
|Reply directly to the sender of the current message|<kbd>R</kbd>|
81+
|New message to a stream|<kbd>c</kbd>|
82+
|New message to a person or group of people|<kbd>x</kbd>|
83+
8084
## Composing a Message
8185
|Command|Key Combination|
8286
| :--- | :---: |

zulipterminal/config/keys.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class KeyBinding(TypedDict):
4949
'OPEN_DRAFT': {
5050
'keys': ['d'],
5151
'help_text': 'Open draft message saved in this session',
52-
'key_category': 'general',
52+
'key_category': 'open_compose',
5353
},
5454
'COPY_ABOUT_INFO': {
5555
'keys': ['c'],
@@ -104,22 +104,22 @@ class KeyBinding(TypedDict):
104104
'REPLY_MESSAGE': {
105105
'keys': ['r', 'enter'],
106106
'help_text': 'Reply to the current message',
107-
'key_category': 'msg_actions',
107+
'key_category': 'open_compose',
108108
},
109109
'MENTION_REPLY': {
110110
'keys': ['@'],
111111
'help_text': 'Reply mentioning the sender of the current message',
112-
'key_category': 'msg_actions',
112+
'key_category': 'open_compose',
113113
},
114114
'QUOTE_REPLY': {
115115
'keys': ['>'],
116116
'help_text': 'Reply quoting the current message text',
117-
'key_category': 'msg_actions',
117+
'key_category': 'open_compose',
118118
},
119119
'REPLY_AUTHOR': {
120120
'keys': ['R'],
121121
'help_text': 'Reply directly to the sender of the current message',
122-
'key_category': 'msg_actions',
122+
'key_category': 'open_compose',
123123
},
124124
'EDIT_MESSAGE': {
125125
'keys': ['e'],
@@ -129,12 +129,12 @@ class KeyBinding(TypedDict):
129129
'STREAM_MESSAGE': {
130130
'keys': ['c'],
131131
'help_text': 'New message to a stream',
132-
'key_category': 'msg_actions',
132+
'key_category': 'open_compose',
133133
},
134134
'PRIVATE_MESSAGE': {
135135
'keys': ['x'],
136136
'help_text': 'New message to a person or group of people',
137-
'key_category': 'msg_actions',
137+
'key_category': 'open_compose',
138138
},
139139
'CYCLE_COMPOSE_FOCUS': {
140140
'keys': ['tab'],
@@ -447,6 +447,7 @@ class KeyBinding(TypedDict):
447447
"searching": "Searching",
448448
"msg_actions": "Message actions",
449449
"stream_list": "Stream list actions",
450+
"open_compose": "Begin composing a message",
450451
"msg_compose": "Composing a Message",
451452
"editor_navigation": "Editor: Navigation",
452453
"editor_text_manipulation": "Editor: Text Manipulation",

0 commit comments

Comments
 (0)