poe

чување 2d3b0eef65c430bc25f8c4bfca7ceaf05f5d91b2
родитељ 165060e58bab530ae1f106c95546f4314b84d365
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Tue,  6 Jul 2021 13:05:20 +0200

Changed ambiguous key bindings; updated manpage and help dialog to match

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
draw.c
 | 
4
++--
M
poe.1.in
 | 
27
+++++++++++++++++++++++----
M
poe.c
 | 
12
++++++------

измењених датотека: 3, додавања: 31(+), брисања: 12(-)
diff --git a/draw.c b/draw.c
@@ -19,8 +19,8 @@ static const char* help[] = {
 	"/   or F7   - Incremental search (end = Enter)",
 	"n   or F3   - Find next",
 	"N   or F4   - Find previous",
-	"F3          - Go to next untranslated entry",
-	"F4          - Go to next fuzzy entry",
+	"F8          - Go to next untranslated entry",
+	"F9          - Go to next fuzzy entry",
 	"g   or Home - Go to first entry", 
 	"C-B or PgUp - Go to previous page",
 	"k   or \u2191    - Go to previous entry",
diff --git a/poe.1.in b/poe.1.in
@@ -71,8 +71,8 @@ _
 \fC/\fP or \fCF7\fP@Incremental search (end input with Enter)
 \fCn\fP or \fCF3\fP@Find next
 \fCN\fP or \fCF4\fP@Find previous
-\fCF3\fP@Go to next untranslated entry
-\fCF4\fP@Go to next fuzzy entry
+\fCF8\fP@Go to next untranslated entry
+\fCF9\fP@Go to next fuzzy entry
 \fCg\fP or \fCHome\fP@Go to first entry
 \fCC-B\fP or \fCPgUp\fP@Go to previous page
 \fCk\fP or \fC\[ua]\fP@Go to previous entry
@@ -101,8 +101,8 @@ _
 \fCEscape\fP@Cancel changes and close dialog
 \fCC-C\fP@Yank (copy) current msgstr to paste buffer
 \fCC-V\fP@Paste the contents of paste buffer into current msgstr
-\fCF3\fP@Go to next untranslated entry
-\fCF4\fP@Go to next fuzzy entry
+\fCF8\fP@Go to next untranslated entry
+\fCF9\fP@Go to next fuzzy entry
 \fCF5\fP@Copy msgid to edit box as current msgstr
 \fCF6\fP@Toggle focus between info box and edit box
 \fCC-Z\fP@Toggle fuzzy flag
@@ -128,6 +128,25 @@ When the info box is focused, arrow keys, \fCC-B\fP/\fCC-F\fP
 (\fCPgUp\fP/\fCPgDn\fP) and \fCC-A\fP/\fCC-E\fP (\fCHome\fP/\fCEnd\fP) keys
 scroll the info box.
 .
+.SH "MESSAGE FLAGS"
+.
+.LP
+Message flags are shown to the left of the msgid in the main window and the
+statusbar of the edit box. They mean the following:
+.
+.TS
+box tab(@);
+l l.
+\fBCharacter\fP@\fBMeaning\fP
+_
+\fCC\fP@\fCc-format\fP flag
+\fCF\fP@\fCfuzzy\fP flag
+\fCP\fP@Message has plural forms
+\fCN\fP@\fCno-c-format\fP flag
+.TE
+.
+.sp 1
+.
 .SH "KNOWN LIMITATIONS"
 .
 .IP \(bu 4
diff --git a/poe.c b/poe.c
@@ -1107,12 +1107,12 @@ handle_editbox_key_event(struct tb_event* ev, struct DrawState* state)
 		cancel_msgstr(state);
 		tb_set_cursor(TB_HIDE_CURSOR, TB_HIDE_CURSOR);
 	}
-	else if (ev->key == TB_KEY_F3)
-		next_untranslated(state);
-	else if (ev->key == TB_KEY_F4)
-		next_fuzzy(state);
 	else if (ev->key == TB_KEY_F6)
 		state->edit_info_focused = !state->edit_info_focused;
+	else if (ev->key == TB_KEY_F8)
+		next_untranslated(state);
+	else if (ev->key == TB_KEY_F9)
+		next_fuzzy(state);
 	else if (ev->key == TB_KEY_HOME
 			|| ev->key == TB_KEY_CTRL_A)
 		move_start(state);
@@ -1293,9 +1293,9 @@ handle_key_event(struct tb_event* ev, struct DrawState* state)
 		state->show_help = 1;
 		state->error[0] = 0;
 	}
-	else if (ev->key == TB_KEY_F3)
+	else if (ev->key == TB_KEY_F8)
 		next_untranslated(state);
-	else if (ev->key == TB_KEY_F4)
+	else if (ev->key == TB_KEY_F9)
 		next_fuzzy(state);
 	else if (ev->key == TB_KEY_HOME || ev->ch == 'g')
 		move_list_start(state);