From 6f90c7ef08ff15544a56d39069f77665012c2140 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Wed, 8 Nov 2023 13:33:18 +0100 Subject: [PATCH] core: move key ctrl+s, ctrl+u to alt+shift+U (issue #2040) --- ChangeLog.adoc | 2 +- doc/de/weechat_user.de.adoc | 2 +- doc/en/weechat_user.en.adoc | 2 +- doc/fr/weechat_user.fr.adoc | 2 +- doc/it/weechat_user.it.adoc | 2 +- doc/ja/weechat_user.ja.adoc | 2 +- doc/pl/weechat_user.pl.adoc | 2 +- doc/sr/weechat_user.sr.adoc | 2 +- src/gui/curses/gui-curses-key.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 8a1c3704c..1f6d7908a 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -15,7 +15,7 @@ For a list of important changes that require manual actions, please look at rele New features:: - * core: move key kbd:[Ctrl+r] to kbd:[Ctrl+s], add key kbd:[Ctrl+r] to search in commands history, add option `search_history` in command `/input`, add key context "histsearch", add option weechat.look.buffer_search_history, add buffer variables "text_search_direction", "text_search_history" and "text_search_ptr_history", add key kbd:[Ctrl+o] to send command found and insert next one in input (issue #2040) + * core: move key kbd:[Ctrl+r] to kbd:[Ctrl+s], add key kbd:[Ctrl+r] to search in commands history, move key kbd:[Ctrl+s], kbd:[Ctrl+u] to kbd:[Alt+Shift+U], add option `search_history` in command `/input`, add key context "histsearch", add option weechat.look.buffer_search_history, add buffer variables "text_search_direction", "text_search_history" and "text_search_ptr_history", add key kbd:[Ctrl+o] to send command found and insert next one in input (issue #2040) * core: display only version with command `/version`, add options `-o` and `-ol` in command `/upgrade` * core: add number of processes in command `/sys waitpid` * core, alias, trigger: allow wildcard in commands `/bar`, `/item`, `/proxy`, `/alias` and `/trigger` (issue #1956) diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc index 39d842c4d..6baeb99ab 100644 --- a/doc/de/weechat_user.de.adoc +++ b/doc/de/weechat_user.de.adoc @@ -1660,7 +1660,6 @@ Sie können mit dem Befehl <> geändert und neue hinzu | kbd:[Ctrl+r] | Search for text in commands history (see <>). | `+/input search_history+` // TRANSLATION MISSING | kbd:[Ctrl+s] | Search for text in buffer lines (see <>). | `+/input search_text_here+` -| kbd:[Ctrl+s], kbd:[Ctrl+u] | setzt für alle Buffer die Markierung für ungelesene Nachrichten. | `+/allbuf /buffer set unread+` | kbd:[Ctrl+x] | Wechseln Sie den aktuellen Buffer, wenn diese zusammengefügt worden sind, z.B. zwischen IRC-Serverbuffer wechseln. | `+/buffer switch+` | kbd:[Alt+x] | Zoom eines zusammengefügten Buffers (kbd:[Alt+x] ein zweites mal: alle zusammengefügten Buffer werden angezeigt). | `+/buffer zoom+` | kbd:[PgUp] | eine Seite im Verlaufsspeicher des Buffers nach oben blättern. | `+/window page_up+` @@ -1686,6 +1685,7 @@ Sie können mit dem Befehl <> geändert und neue hinzu | kbd:[Alt+n] | springt zur nächsten Highlight Nachricht. | `+/window scroll_next_highlight+` | kbd:[Alt+p] | springt zur vorherigen Highlight Nachricht. | `+/window scroll_previous_highlight+` | kbd:[Alt+u] | springt zur ersten ungelesenen Zeile im Buffer. | `+/window scroll_unread+` +| kbd:[Alt+Shift+U] | setzt für alle Buffer die Markierung für ungelesene Nachrichten. | `+/allbuf /buffer set unread+` | kbd:[Alt+<] | springt zum letzten besuchten Buffer. | `+/buffer jump prev_visited+` | kbd:[Alt+>] | springt zum nächsten besuchten Buffer. | `+/buffer jump next_visited+` | kbd:[Alt+/] | wechselt zum jeweils zuletzt angezeigten Buffern. | `+/buffer jump last_displayed+` diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc index 6a7797b8a..a7b65d710 100644 --- a/doc/en/weechat_user.en.adoc +++ b/doc/en/weechat_user.en.adoc @@ -1635,7 +1635,6 @@ They can be changed and new ones can be added with the <>). | `+/input search_history+` | kbd:[Ctrl+s] | Search for text in buffer lines (see <>). | `+/input search_text_here+` -| kbd:[Ctrl+s], kbd:[Ctrl+u] | Set unread marker on all buffers. | `+/allbuf /buffer set unread+` | kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/buffer switch+` | kbd:[Alt+x] | Zoom on merged buffer (kbd:[Alt+x] again: display all merged buffers). | `+/buffer zoom+` | kbd:[PgUp] | Scroll up one page in buffer history. | `+/window page_up+` @@ -1661,6 +1660,7 @@ They can be changed and new ones can be added with the <] | Switch to next buffer in list of visited buffers. | `+/buffer jump next_visited+` | kbd:[Alt+/] | Switch to last buffer displayed (before last jump to a buffer). | `+/buffer jump last_displayed+` diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc index f4b3e6c2e..e6d4c83d8 100644 --- a/doc/fr/weechat_user.fr.adoc +++ b/doc/fr/weechat_user.fr.adoc @@ -1670,7 +1670,6 @@ Ils peuvent être modifiés et de nouveaux peuvent être ajoutés avec la comman | Touche | Description | Commande | kbd:[Ctrl+r] | Chercher du texte dans l'historique de commandes (voir <>). | `+/input search_history+` | kbd:[Ctrl+s] | Chercher du texte dans les lignes du tampon (voir <>). | `+/input search_text_here+` -| kbd:[Ctrl+s], kbd:[Ctrl+u] | Positionner le marqueur de données non lues sur tous les tampons. | `+/allbuf /buffer set unread+` | kbd:[Ctrl+x] | Changer de tampon courant si plusieurs tampons sont mélangés avec le même numéro, par exemple basculer vers un autre tampon serveur IRC. | `+/buffer switch+` | kbd:[Alt+x] | Zoomer sur le tampon mélangé (kbd:[Alt+x] de nouveau : afficher tous les tampons mélangés). | `+/buffer zoom+` | kbd:[PgUp] | Monter d'une page dans l'historique du tampon. | `+/window page_up+` @@ -1696,6 +1695,7 @@ Ils peuvent être modifiés et de nouveaux peuvent être ajoutés avec la comman | kbd:[Alt+n] | Se positionner sur le highlight suivant. | `+/window scroll_next_highlight+` | kbd:[Alt+p] | Se positionner sur le highlight précédent. | `+/window scroll_previous_highlight+` | kbd:[Alt+u] | Se positionner sur la première ligne non lue du tampon. | `+/window scroll_unread+` +| kbd:[Alt+Shift+U] | Positionner le marqueur de données non lues sur tous les tampons. | `+/allbuf /buffer set unread+` | kbd:[Alt+<] | Sauter au tampon précédent dans la liste des tampons visités. | `+/buffer jump prev_visited+` | kbd:[Alt+>] | Sauter au tampon suivant dans la liste des tampons visités. | `+/buffer jump next_visited+` | kbd:[Alt+/] | Sauter au dernier tampon affiché (avant le dernier saut vers un tampon). | `+/buffer jump last_displayed+` diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc index eb86ddfac..c7abe8066 100644 --- a/doc/it/weechat_user.it.adoc +++ b/doc/it/weechat_user.it.adoc @@ -1792,7 +1792,6 @@ They can be changed and new ones can be added with the <>). | `+/input search_history+` // TRANSLATION MISSING | kbd:[Ctrl+s] | Search for text in buffer lines (see <>). | `+/input search_text_here+` -| kbd:[Ctrl+s], kbd:[Ctrl+u] | Imposta l'evidenziatore dei messaggi non letti su tutti i buffer. | `+/allbuf /buffer set unread+` // TRANSLATION MISSING | kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/buffer switch+` // TRANSLATION MISSING @@ -1821,6 +1820,7 @@ They can be changed and new ones can be added with the <] | Passa al buffer successivo nella lista dei buffer visitati. | `+/buffer jump next_visited+` | kbd:[Alt+/] | Passa all'ultimo buffer mostrato (prima dell'ultimo passaggio ad un buffer). | `+/buffer jump last_displayed+` diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc index d54a457e5..e4aa456d5 100644 --- a/doc/ja/weechat_user.ja.adoc +++ b/doc/ja/weechat_user.ja.adoc @@ -1756,7 +1756,6 @@ They can be changed and new ones can be added with the <>). | `+/input search_history+` // TRANSLATION MISSING | kbd:[Ctrl+s] | Search for text in buffer lines (see <>). | `+/input search_text_here+` -| kbd:[Ctrl+s], kbd:[Ctrl+u] | すべてのバッファに未読マークをセット | `+/allbuf /buffer set unread+` // TRANSLATION MISSING | kbd:[Ctrl+x] | Switch current buffer if buffers are merged with same number, for example switch to another IRC server buffer. | `+/buffer switch+` | kbd:[Alt+x] | マージされたバッファに再ズーム (kbd:[Alt+x]: 全てのマージされたバッファを表示) | `+/buffer zoom+` @@ -1783,6 +1782,7 @@ They can be changed and new ones can be added with the <] | バッファ訪問履歴で次のバッファに移動 | `+/buffer jump next_visited+` | kbd:[Alt+/] | 最後に表示したバッファに移動 (バッファ移動前に表示していたウィンドウ) | `+/buffer jump last_displayed+` diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc index 6e9843113..e83982a43 100644 --- a/doc/pl/weechat_user.pl.adoc +++ b/doc/pl/weechat_user.pl.adoc @@ -1663,7 +1663,6 @@ Można je zmienić oraz dodać nowe za pomocą komendy <>). | `+/input search_history+` // TRANSLATION MISSING | kbd:[Ctrl+s] | Search for text in buffer lines (see <>). | `+/input search_text_here+` -| kbd:[Ctrl+s], kbd:[Ctrl+u] | Ustaw znacznik nieprzeczytania we wszystkich buforach. | `+/allbuf /buffer set unread+` | kbd:[Ctrl+x] | Przełącz obecny bufor jeśli bufory są połączone pod tym samym numerem, na przykład przełącz na bufor innego serwera IRC. | `+/buffer switch+` | kbd:[Alt+x] | Pokaż wybrany z połączonych buforów (naciśnij kbd:[Alt+x] ponownie: wyświetl wszystkie połączone bufory). | `+/buffer zoom+` | kbd:[PgUp] | Przewiń jedną stronę w górę w historii bufora. | `+/window page_up+` @@ -1689,6 +1688,7 @@ Można je zmienić oraz dodać nowe za pomocą komendy <] | Przełącz na następny bufor z listy odwiedzonych buforów. | `+/buffer jump next_visited+` | kbd:[Alt+/] | Przełącz na ostatnio wyświetlony bufor (przed ostatnią zmianą bufora). | `+/buffer jump last_displayed+` diff --git a/doc/sr/weechat_user.sr.adoc b/doc/sr/weechat_user.sr.adoc index 9a06a7b1d..e9822dc1c 100644 --- a/doc/sr/weechat_user.sr.adoc +++ b/doc/sr/weechat_user.sr.adoc @@ -1568,7 +1568,6 @@ WeeChat нуди доста подразумеваних тастерских п | kbd:[Ctrl+r] | Search for text in commands history (see <>). | `+/input search_history+` // TRANSLATION MISSING | kbd:[Ctrl+s] | Search for text in buffer lines (see <>). | `+/input search_text_here+` -| kbd:[Ctrl+s], kbd:[Ctrl+u] | Поставља маркер непрочитано за све бафере. | `+/allbuf /buffer set unread+` | kbd:[Ctrl+x] | Мења текући бафер ако су бафери спојени са истим бројем, на пример, прелазак на други IRC сервер бафер. | `+/buffer switch+` | kbd:[Alt+x] | Зум на спојени бафер (kbd:[Alt+x] поново: приказује све спојене бафере). | `+/buffer zoom+` | kbd:[PgUp] | Скролује навише једну страну у историји бафера. | `+/window page_up+` @@ -1594,6 +1593,7 @@ WeeChat нуди доста подразумеваних тастерских п | kbd:[Alt+n] | Скроловање до наредног истицања. | `+/window scroll_next_highlight+` | kbd:[Alt+p] | Скроловање на претходно истицање. | `+/window scroll_previous_highlight+` | kbd:[Alt+u] | Скроловање на прву непрочитану линију у баферу. | `+/window scroll_unread+` +| kbd:[Alt+Shift+U] | Поставља маркер непрочитано за све бафере. | `+/allbuf /buffer set unread+` | kbd:[Alt+<] | Прелаз на претходни бафер у листи посећених бафера. | `+/buffer jump prev_visited+` | kbd:[Alt+>] | Прелаз на наредни бафер у листи посећених бафера. | `+/buffer jump next_visited+` | kbd:[Alt+/] | Прелаз на последње приказани бафер. | `+/buffer jump last_displayed+` diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c index ae228c439..51096c4ca 100644 --- a/src/gui/curses/gui-curses-key.c +++ b/src/gui/curses/gui-curses-key.c @@ -139,7 +139,7 @@ gui_key_default_bindings (int context, int create_option) BIND("meta-k", "/input grab_key_command"); BIND("meta-s", "/mute spell toggle"); BIND("meta-u", "/window scroll_unread"); - BIND("ctrl-s,ctrl-u", "/allbuf /buffer set unread"); + BIND("meta-U", "/allbuf /buffer set unread"); BIND("ctrl-c,b", "/input insert \\x02"); BIND("ctrl-c,c", "/input insert \\x03"); BIND("ctrl-c,d", "/input insert \\x04");