From babe1e7a423a097cb4a6dcf709d31cfbc548afb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 25 Dec 2022 18:50:57 +0100 Subject: [PATCH] core: move `/input` hotlist actions to new command `/hotlist` Actions moved to command `/hotlist`: * `/input hotlist_clear` -> `/hotlist clear` * `/input hotlist_remove_buffer` -> `/hotlist remove` * `/input hotlist_restore_buffer` -> `/hotlist restore` * `/input hotlist_restore_all` -> `/hotlist restore -all` --- ChangeLog.adoc | 3 +- ReleaseNotes.adoc | 20 ++-- doc/de/includes/autogen_user_commands.de.adoc | 18 +++- doc/de/weechat_user.de.adoc | 8 +- doc/en/includes/autogen_user_commands.en.adoc | 18 +++- doc/en/weechat_user.en.adoc | 8 +- doc/fr/includes/autogen_user_commands.fr.adoc | 18 +++- doc/fr/weechat_user.fr.adoc | 8 +- doc/it/includes/autogen_user_commands.it.adoc | 18 +++- doc/it/weechat_user.it.adoc | 8 +- doc/ja/includes/autogen_user_commands.ja.adoc | 18 +++- doc/ja/weechat_user.ja.adoc | 8 +- doc/pl/includes/autogen_user_commands.pl.adoc | 18 +++- doc/pl/weechat_user.pl.adoc | 8 +- doc/sr/includes/autogen_user_commands.sr.adoc | 18 +++- doc/sr/weechat_user.sr.adoc | 8 +- po/cs.po | 28 +++-- po/de.po | 28 +++-- po/es.po | 28 +++-- po/fr.po | 46 ++++---- po/hu.po | 27 +++-- po/it.po | 28 +++-- po/ja.po | 28 +++-- po/pl.po | 28 +++-- po/pt.po | 28 +++-- po/pt_BR.po | 28 +++-- po/ru.po | 27 +++-- po/sr.po | 28 +++-- po/tr.po | 28 +++-- po/weechat.pot | 26 +++-- src/core/wee-command.c | 84 +++++++++++---- src/gui/curses/gui-curses-key.c | 8 +- src/gui/gui-hotlist.c | 85 ++++++++++++++- src/gui/gui-hotlist.h | 3 + src/gui/gui-input.c | 102 ------------------ src/gui/gui-input.h | 5 - tests/unit/gui/test-gui-input.cpp | 40 ------- 37 files changed, 566 insertions(+), 372 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 685d8d1da..e6abcd8be 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -20,7 +20,8 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] New features:: - * core: move `/input` jump actions to command `/buffer jump smart|last_displayed|prev_visited|next_visited` + * core: add command `/hotlist` + * core: move some `/input` actions to commands `/buffer jump` and `/hotlist` * core: improve case convert and insensitive char comparisons (issue #258) * core: add color attributes "blink" and "dim" (half bright) (issue #1855) * core: allow command `/toggle` to create option before setting the value, if allowed in the section (issue #1837) diff --git a/ReleaseNotes.adoc b/ReleaseNotes.adoc index 8aea246e2..90bf931e9 100644 --- a/ReleaseNotes.adoc +++ b/ReleaseNotes.adoc @@ -24,13 +24,17 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog] === Options in command /input Some options of `/input` command have been moved to other commands (they can -still be used with `/input` but marked as deprecated and completion doesn't -work any more): +still be used with `/input` but marked as deprecated and completion has been +removed): -* `/input jump_smart` -> `/buffer jump smart` -* `/input jump_previously_visited_buffer` -> `/buffer jump prev_visited` -* `/input jump_next_visited_buffer` -> `/buffer jump next_visited` -* `/input jump_last_buffer_displayed` -> `/buffer jump last_displayed` +* `/input jump_smart` -> `/buffer jump smart` (default key: kbd:[Alt+a]) +* `/input jump_previously_visited_buffer` -> `/buffer jump prev_visited` (default key: kbd:[Alt+<]) +* `/input jump_next_visited_buffer` -> `/buffer jump next_visited` (default key: kbd:[Alt+>]) +* `/input jump_last_buffer_displayed` -> `/buffer jump last_displayed` (default key: kbd:[Alt+/]) +* `/input hotlist_clear` -> `/hotlist clear` (default key: kbd:[Alt+h], kbd:[Alt+c]) +* `/input hotlist_remove_buffer` -> `/hotlist remove` (default key: kbd:[Alt+h], kbd:[Alt+m]) +* `/input hotlist_restore_buffer` -> `/hotlist restore` (default key: kbd:[Alt+h], kbd:[Alt+r]) +* `/input hotlist_restore_all` -> `/hotlist restore -all` (default key: kbd:[Alt+h], kbd:[Alt+Shift+R]) The following default keys can be reset to use the new command: @@ -39,6 +43,10 @@ The following default keys can be reset to use the new command: /key reset meta-< /key reset meta-> /key reset meta-/ +/key reset meta-hmeta-c +/key reset meta-hmeta-m +/key reset meta-hmeta-r +/key reset meta-hmeta-R ---- [[v3.8_return_code_string_comparison_functions]] diff --git a/doc/de/includes/autogen_user_commands.de.adoc b/doc/de/includes/autogen_user_commands.de.adoc index e1d94605e..491d5755b 100644 --- a/doc/de/includes/autogen_user_commands.de.adoc +++ b/doc/de/includes/autogen_user_commands.de.adoc @@ -1609,6 +1609,20 @@ clear: löscht den Befehlsverlauf value: Anzahl der gewünschten Einträgen im Befehlsverlauf anzeigen ---- +[[command_weechat_hotlist]] +* `+hotlist+`: manage hotlist + +---- +/hotlist clear [] + remove + restore [-all] + +clear: clear hotlist +level: "lowest" to clear only lowest level in hotlist, highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) +remove: remove current buffer from hotlist +restore: restore latest hotlist removed in the current buffer (or all buffers with -all) +---- + [[command_weechat_input]] * `+input+`: Funktionen für die Befehlszeile @@ -1650,10 +1664,6 @@ list of actions: history_next: recall next command in current buffer history history_global_previous: recall previous command in global history history_global_next: recall next command in global history - hotlist_clear: clear hotlist (optional argument: "lowest" to clear only lowest level in hotlist, "highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) - hotlist_remove_buffer: remove current buffer from hotlist - hotlist_restore_buffer: restore latest hotlist removed in the current buffer - hotlist_restore_all: restore latest hotlist removed in all buffers grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds) grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc index 5dc663df1..499329c64 100644 --- a/doc/de/weechat_user.de.adoc +++ b/doc/de/weechat_user.de.adoc @@ -1667,10 +1667,10 @@ Sie können mit dem Befehl <> geändert und neue hinzu |=== | Taste | Beschreibung | Befehl | kbd:[Alt+a] | wechselt zum nächsten Buffer mit Aktivität (nach Priorität: highlight, Nachricht, ...). | `+/buffer jump smart+` -| kbd:[Alt+h], kbd:[Alt+c] | Hotlist löschen (Aktivitätsbenachrichtigung bei Buffern). | `+/input hotlist_clear+` -| kbd:[Alt+h], kbd:[Alt+m] | Aktuellen Puffer aus Hotlist entfernen. | `+/input hotlist_remove_buffer+` -| kbd:[Alt+h], kbd:[Alt+r] | stelle die letzte aus dem aktuellen Buffer entfernte Hotlist wieder her. | `+/input hotlist_restore_buffer+` -| kbd:[Alt+h], kbd:[Alt+Shift+R] | stelle die neueste Hotlist wieder her, die in allen Buffern entfernt wurde. | `+/input hotlist_restore_all+` +| kbd:[Alt+h], kbd:[Alt+c] | Hotlist löschen (Aktivitätsbenachrichtigung bei Buffern). | `+/hotlist clear+` +| kbd:[Alt+h], kbd:[Alt+m] | Aktuellen Puffer aus Hotlist entfernen. | `+/hotlist remove+` +| kbd:[Alt+h], kbd:[Alt+r] | stelle die letzte aus dem aktuellen Buffer entfernte Hotlist wieder her. | `+/hotlist restore+` +| kbd:[Alt+h], kbd:[Alt+Shift+R] | stelle die neueste Hotlist wieder her, die in allen Buffern entfernt wurde. | `+/hotlist restore -all+` |=== [[key_bindings_toggle_keys]] diff --git a/doc/en/includes/autogen_user_commands.en.adoc b/doc/en/includes/autogen_user_commands.en.adoc index a90b7673f..9be81508c 100644 --- a/doc/en/includes/autogen_user_commands.en.adoc +++ b/doc/en/includes/autogen_user_commands.en.adoc @@ -1609,6 +1609,20 @@ clear: clear history value: number of history entries to show ---- +[[command_weechat_hotlist]] +* `+hotlist+`: manage hotlist + +---- +/hotlist clear [] + remove + restore [-all] + +clear: clear hotlist +level: "lowest" to clear only lowest level in hotlist, highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) +remove: remove current buffer from hotlist +restore: restore latest hotlist removed in the current buffer (or all buffers with -all) +---- + [[command_weechat_input]] * `+input+`: functions for command line @@ -1650,10 +1664,6 @@ list of actions: history_next: recall next command in current buffer history history_global_previous: recall previous command in global history history_global_next: recall next command in global history - hotlist_clear: clear hotlist (optional argument: "lowest" to clear only lowest level in hotlist, "highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) - hotlist_remove_buffer: remove current buffer from hotlist - hotlist_restore_buffer: restore latest hotlist removed in the current buffer - hotlist_restore_all: restore latest hotlist removed in all buffers grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds) grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc index e16e737ea..f31913298 100644 --- a/doc/en/weechat_user.en.adoc +++ b/doc/en/weechat_user.en.adoc @@ -1650,10 +1650,10 @@ They can be changed and new ones can be added with the <] + remove + restore [-all] + + clear : effacer la hotlist + niveau : "lowest" pour effacer seulement le plus petit niveau dans la hotlist, "highest" pour effacer seulement le niveau le plus haut dans la hotlist, ou un masque de niveaux : entier qui est une combinaison de 1=join/part, 2=message, 4=privé, 8=highlight + remove : supprimer le tampon courant de la hotlist +restore : restaurer la dernière hotlist supprimée dans le tampon courant (ou tous les tampons avec -all) +---- + [[command_weechat_input]] * `+input+`: fonctions pour la ligne de commande @@ -1650,10 +1664,6 @@ liste des actions : history_next : rappeler la commande suivante dans l'historique du tampon courant history_global_previous : rappeler la commande précédente dans l'historique global history_global_next : rappeler la commande suivante dans l'historique global - hotlist_clear : effacer la hotlist (paramètre facultatif : "lowest" pour effacer seulement le plus petit niveau dans la hotlist, "highest" pour effacer seulement le niveau le plus haut dans la hotlist, ou un masque de niveaux : entier qui est une combinaison de 1=join/part, 2=message, 4=privé, 8=highlight) - hotlist_remove_buffer : supprimer le tampon courant de la hotlist - hotlist_restore_buffer : restaurer la dernière hotlist supprimée dans le tampon courant - hotlist_restore_all : restaurer la dernière hotlist supprimée dans tous les tampons grab_key : capturer une touche (paramètre facultatif : délai pour la fin de la capture, par défaut 500 millisecondes) grab_key_command : capturer une touche avec sa commande associée (paramètre facultatif : délai pour la fin de la capture, par défaut 500 millisecondes) grab_mouse : capturer un évènement de la souris diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc index dc5ddeb48..014cf4674 100644 --- a/doc/fr/weechat_user.fr.adoc +++ b/doc/fr/weechat_user.fr.adoc @@ -1689,10 +1689,10 @@ Ils peuvent être modifiés et de nouveaux peuvent être ajoutés avec la comman |=== | Touche | Description | Commande | kbd:[Alt+a] | Sauter au prochain tampon avec activité (avec priorité : highlight, message, autre). | `+/buffer jump smart+` -| kbd:[Alt+h], kbd:[Alt+c] | Vider la hotlist (notification d'activité sur les tampons). | `+/input hotlist_clear+` -| kbd:[Alt+h], kbd:[Alt+m] | Supprimer le tampon courant de la hotlist. | `+/input hotlist_remove_buffer+` -| kbd:[Alt+h], kbd:[Alt+r] | Restaurer la dernière hotlist supprimée dans le tampon courant. | `+/input hotlist_restore_buffer+` -| kbd:[Alt+h], kbd:[Alt+Shift+R] | Restaurer la dernière hotlist supprimée dans tous les tampons. | `+/input hotlist_restore_all+` +| kbd:[Alt+h], kbd:[Alt+c] | Vider la hotlist (notification d'activité sur les tampons). | `+/hotlist clear+` +| kbd:[Alt+h], kbd:[Alt+m] | Supprimer le tampon courant de la hotlist. | `+/hotlist remove+` +| kbd:[Alt+h], kbd:[Alt+r] | Restaurer la dernière hotlist supprimée dans le tampon courant. | `+/hotlist restore+` +| kbd:[Alt+h], kbd:[Alt+Shift+R] | Restaurer la dernière hotlist supprimée dans tous les tampons. | `+/hotlist restore -all+` |=== [[key_bindings_toggle_keys]] diff --git a/doc/it/includes/autogen_user_commands.it.adoc b/doc/it/includes/autogen_user_commands.it.adoc index 2558c4265..2f3d3b00e 100644 --- a/doc/it/includes/autogen_user_commands.it.adoc +++ b/doc/it/includes/autogen_user_commands.it.adoc @@ -1609,6 +1609,20 @@ Examples: valore: numero delle voci nella cronologia da mostrare ---- +[[command_weechat_hotlist]] +* `+hotlist+`: manage hotlist + +---- +/hotlist clear [] + remove + restore [-all] + +clear: clear hotlist +level: "lowest" to clear only lowest level in hotlist, highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) +remove: remove current buffer from hotlist +restore: restore latest hotlist removed in the current buffer (or all buffers with -all) +---- + [[command_weechat_input]] * `+input+`: funzioni per la riga di comando @@ -1650,10 +1664,6 @@ list of actions: history_next: recall next command in current buffer history history_global_previous: recall previous command in global history history_global_next: recall next command in global history - hotlist_clear: clear hotlist (optional argument: "lowest" to clear only lowest level in hotlist, "highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) - hotlist_remove_buffer: remove current buffer from hotlist - hotlist_restore_buffer: restore latest hotlist removed in the current buffer - hotlist_restore_all: restore latest hotlist removed in all buffers grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds) grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc index eba0faf67..4998a32eb 100644 --- a/doc/it/weechat_user.it.adoc +++ b/doc/it/weechat_user.it.adoc @@ -1800,13 +1800,13 @@ They can be changed and new ones can be added with the <] + remove + restore [-all] + +clear: clear hotlist +level: "lowest" to clear only lowest level in hotlist, highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) +remove: remove current buffer from hotlist +restore: restore latest hotlist removed in the current buffer (or all buffers with -all) +---- + [[command_weechat_input]] * `+input+`: コマンドライン関数 @@ -1650,10 +1664,6 @@ list of actions: history_next: recall next command in current buffer history history_global_previous: recall previous command in global history history_global_next: recall next command in global history - hotlist_clear: clear hotlist (optional argument: "lowest" to clear only lowest level in hotlist, "highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) - hotlist_remove_buffer: remove current buffer from hotlist - hotlist_restore_buffer: restore latest hotlist removed in the current buffer - hotlist_restore_all: restore latest hotlist removed in all buffers grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds) grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc index b99caf015..78051686d 100644 --- a/doc/ja/weechat_user.ja.adoc +++ b/doc/ja/weechat_user.ja.adoc @@ -1743,13 +1743,13 @@ They can be changed and new ones can be added with the <] + remove + restore [-all] + +clear: clear hotlist +level: "lowest" to clear only lowest level in hotlist, highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) +remove: remove current buffer from hotlist +restore: restore latest hotlist removed in the current buffer (or all buffers with -all) +---- + [[command_weechat_input]] * `+input+`: funkcje linii komend @@ -1649,10 +1663,6 @@ list of actions: history_next: recall next command in current buffer history history_global_previous: recall previous command in global history history_global_next: recall next command in global history - hotlist_clear: clear hotlist (optional argument: "lowest" to clear only lowest level in hotlist, "highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) - hotlist_remove_buffer: remove current buffer from hotlist - hotlist_restore_buffer: restore latest hotlist removed in the current buffer - hotlist_restore_all: restore latest hotlist removed in all buffers grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds) grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc index 9c903d83f..9ef817f89 100644 --- a/doc/pl/weechat_user.pl.adoc +++ b/doc/pl/weechat_user.pl.adoc @@ -1678,10 +1678,10 @@ Można je zmienić oraz dodać nowe za pomocą komendy <] + remove + restore [-all] + +clear: clear hotlist +level: "lowest" to clear only lowest level in hotlist, highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) +remove: remove current buffer from hotlist +restore: restore latest hotlist removed in the current buffer (or all buffers with -all) +---- + [[command_weechat_input]] * `+input+`: функције за командну линију @@ -1650,10 +1664,6 @@ list of actions: history_next: recall next command in current buffer history history_global_previous: recall previous command in global history history_global_next: recall next command in global history - hotlist_clear: clear hotlist (optional argument: "lowest" to clear only lowest level in hotlist, "highest" to clear only highest level in hotlist, or level mask: integer which is a combination of 1=join/part, 2=message, 4=private, 8=highlight) - hotlist_remove_buffer: remove current buffer from hotlist - hotlist_restore_buffer: restore latest hotlist removed in the current buffer - hotlist_restore_all: restore latest hotlist removed in all buffers grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds) grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) grab_mouse: grab mouse event code diff --git a/doc/sr/weechat_user.sr.adoc b/doc/sr/weechat_user.sr.adoc index a614a0341..7bcd10299 100644 --- a/doc/sr/weechat_user.sr.adoc +++ b/doc/sr/weechat_user.sr.adoc @@ -1560,10 +1560,10 @@ WeeChat нуди доста подразумеваних тастерских п |=== | Тастер | Опис | Команда | kbd:[Alt+a] | Пребацивање на следећи бафер у коме има активности (са приоритетом: истицање, порука, остало). | `+/buffer jump smart+` -| kbd:[Alt+h], kbd:[Alt+c] | Брисање вруће листе (обавештења о активности у баферима). | `+/input hotlist_clear+` -| kbd:[Alt+h], kbd:[Alt+m] | Уклањање текућег бафера из вруће листе. | `+/input hotlist_remove_buffer+` -| kbd:[Alt+h], kbd:[Alt+r] | Враћање најновије вруће листе уклоњене из текућег бафера. | `+/input hotlist_restore_buffer+` -| kbd:[Alt+h], kbd:[Alt+Shift+R] | Враћање најновије вруће листе уклоњене из свих бафера. | `+/input hotlist_restore_all+` +| kbd:[Alt+h], kbd:[Alt+c] | Брисање вруће листе (обавештења о активности у баферима). | `+/hotlist clear+` +| kbd:[Alt+h], kbd:[Alt+m] | Уклањање текућег бафера из вруће листе. | `+/hotlist remove+` +| kbd:[Alt+h], kbd:[Alt+r] | Враћање најновије вруће листе уклоњене из текућег бафера. | `+/hotlist restore+` +| kbd:[Alt+h], kbd:[Alt+Shift+R] | Враћање најновије вруће листе уклоњене из свих бафера. | `+/hotlist restore -all+` |=== [[key_bindings_toggle_keys]] diff --git a/po/cs.po b/po/cs.po index 60252dc21..effd8e05b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -1822,6 +1822,24 @@ msgstr "" "clear: vyčistit historii\n" "value: číslo z položek historie kterou ukazat" +#, fuzzy +#| msgid "manage proxies" +msgid "manage hotlist" +msgstr "spravovat proxy" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "funkce pro příkazovou řádku" @@ -1865,14 +1883,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/de.po b/po/de.po index 3152653fe..5f4f666f4 100644 --- a/po/de.po +++ b/po/de.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-12-14 22:37+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German - Germany \n" @@ -2323,6 +2323,24 @@ msgstr "" "clear: löscht den Befehlsverlauf\n" "value: Anzahl der gewünschten Einträgen im Befehlsverlauf anzeigen" +#, fuzzy +#| msgid "manage proxies" +msgid "manage hotlist" +msgstr "Proxys verwalten" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "Funktionen für die Befehlszeile" @@ -2434,14 +2452,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/es.po b/po/es.po index 3795294bd..6a8fb9c58 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -2226,6 +2226,24 @@ msgstr "" "clear: limpiar historial\n" "valor: número de entradas del historial a mostrar" +#, fuzzy +#| msgid "manage proxies" +msgid "manage hotlist" +msgstr "gestionar los proxies" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "funciones para la línea de comandos" @@ -2269,14 +2287,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/fr.po b/po/fr.po index ae7098594..fbfe72ab3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" -"PO-Revision-Date: 2022-12-25 16:51+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" +"PO-Revision-Date: 2022-12-25 18:46+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -2169,6 +2169,30 @@ msgstr "" " clear : effacer l'historique\n" "valeur : nombre d'entrées dans l'historique à afficher" +msgid "manage hotlist" +msgstr "gestion de la hotlist" + +msgid "clear [] || remove || restore [-all]" +msgstr "clear [] || remove || restore [-all]" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" +" clear : effacer la hotlist\n" +" niveau : \"lowest\" pour effacer seulement le plus petit niveau dans la " +"hotlist, \"highest\" pour effacer seulement le niveau le plus haut dans la " +"hotlist, ou un masque de niveaux : entier qui est une combinaison de 1=join/" +"part, 2=message, 4=privé, 8=highlight\n" +" remove : supprimer le tampon courant de la hotlist\n" +"restore : restaurer la dernière hotlist supprimée dans le tampon courant (ou " +"tous les tampons avec -all)" + msgid "functions for command line" msgstr "fonctions pour la ligne de commande" @@ -2211,14 +2235,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " @@ -2280,16 +2296,6 @@ msgstr "" "l'historique global\n" " history_global_next : rappeler la commande suivante dans l'historique " "global\n" -" hotlist_clear : effacer la hotlist (paramètre facultatif : \"lowest\" pour " -"effacer seulement le plus petit niveau dans la hotlist, \"highest\" pour " -"effacer seulement le niveau le plus haut dans la hotlist, ou un masque de " -"niveaux : entier qui est une combinaison de 1=join/part, 2=message, 4=privé, " -"8=highlight)\n" -" hotlist_remove_buffer : supprimer le tampon courant de la hotlist\n" -" hotlist_restore_buffer : restaurer la dernière hotlist supprimée dans le " -"tampon courant\n" -" hotlist_restore_all : restaurer la dernière hotlist supprimée dans tous " -"les tampons\n" " grab_key : capturer une touche (paramètre facultatif : délai pour la fin " "de la capture, par défaut 500 millisecondes)\n" " grab_key_command : capturer une touche avec sa commande associée " diff --git a/po/hu.po b/po/hu.po index 2953d5d2c..0e3113cb9 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1698,6 +1698,23 @@ msgstr "" "clear: előzmények törlése\n" "érték: mutatandó előzmények száma" +#, fuzzy +msgid "manage hotlist" +msgstr "pufferek kezelése" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + #, fuzzy msgid "functions for command line" msgstr "szöveg beillesztése a parancssorba" @@ -1742,14 +1759,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/it.po b/po/it.po index 67ef17849..216ac1d55 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -1885,6 +1885,24 @@ msgstr "" " clear: pulisci cronologia\n" "valore: numero delle voci nella cronologia da mostrare" +#, fuzzy +#| msgid "manage proxies" +msgid "manage hotlist" +msgstr "gestione dei proxy" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "funzioni per la riga di comando" @@ -1928,14 +1946,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/ja.po b/po/ja.po index e20b06bc7..1a55ecdb8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese ] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "コマンドライン関数" @@ -2187,14 +2205,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/pl.po b/po/pl.po index d062a1c75..35191a501 100644 --- a/po/pl.po +++ b/po/pl.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: Polish \n" @@ -2393,6 +2393,24 @@ msgstr "" "clear: czyści historie\n" "Wartość: ilość elementów historii do pokazania" +#, fuzzy +#| msgid "manage proxies" +msgid "manage hotlist" +msgstr "zarządzanie proxy" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "funkcje linii komend" @@ -2502,14 +2520,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/pt.po b/po/pt.po index ee20b27bb..804a38dd7 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -2074,6 +2074,24 @@ msgstr "" "clear: apagar o histórico\n" "valor: número de entradas do histórico para mostrar" +#, fuzzy +#| msgid "manage proxies" +msgid "manage hotlist" +msgstr "gerir os proxies" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "funções da linha de comandos" @@ -2179,14 +2197,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/pt_BR.po b/po/pt_BR.po index 97671d53b..4b9a08692 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -1950,6 +1950,24 @@ msgstr "" "clear: limpa histórico\n" "valor: número de entradas do histórico para mostrar" +#, fuzzy +#| msgid "manage proxies" +msgid "manage hotlist" +msgstr "gerenciar proxies" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "funções para linha de comando" @@ -1994,14 +2012,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/ru.po b/po/ru.po index bdde30ada..5d2c161bb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -1719,6 +1719,23 @@ msgstr "" " clear: очистить историю\n" "значение: количество отображаемых пунктов истории" +#, fuzzy +msgid "manage hotlist" +msgstr "управление буферами" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + #, fuzzy msgid "functions for command line" msgstr "вставить строку в поле ввода" @@ -1763,14 +1780,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/sr.po b/po/sr.po index 1b7f7b8f4..e7e673f3a 100644 --- a/po/sr.po +++ b/po/sr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-12-05 09:44+0400\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -2250,6 +2250,24 @@ msgstr "" " clear: брише историју\n" "вредност: број ставки из историје које ће се приказати" +#, fuzzy +#| msgid "manage proxies" +msgid "manage hotlist" +msgstr "управљање проксијима" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "функције за командну линију" @@ -2361,14 +2379,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/tr.po b/po/tr.po index 36400d485..bd0eb293b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -2372,6 +2372,24 @@ msgstr "" "clear: geçmişi temizle\n" "değer: gösterilecek geçmiş girdileri sayısı" +#, fuzzy +#| msgid "manage proxies" +msgid "manage hotlist" +msgstr "vekilleri yönet" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "komut satırı için fonksiyonlar" @@ -2481,14 +2499,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/po/weechat.pot b/po/weechat.pot index 40eeff0c4..9c8fb43f8 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-12-25 16:37+0100\n" +"POT-Creation-Date: 2022-12-25 18:41+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -1560,6 +1560,22 @@ msgid "" "value: number of history entries to show" msgstr "" +msgid "manage hotlist" +msgstr "" + +msgid "clear [] || remove || restore [-all]" +msgstr "" + +msgid "" +"clear: clear hotlist\n" +"level: \"lowest\" to clear only lowest level in hotlist, highest\" to clear " +"only highest level in hotlist, or level mask: integer which is a combination " +"of 1=join/part, 2=message, 4=private, 8=highlight)\n" +"remove: remove current buffer from hotlist\n" +"restore: restore latest hotlist removed in the current buffer (or all " +"buffers with -all)" +msgstr "" + msgid "functions for command line" msgstr "" @@ -1602,14 +1618,6 @@ msgid "" " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" -" hotlist_clear: clear hotlist (optional argument: \"lowest\" to clear only " -"lowest level in hotlist, \"highest\" to clear only highest level in hotlist, " -"or level mask: integer which is a combination of 1=join/part, 2=message, " -"4=private, 8=highlight)\n" -" hotlist_remove_buffer: remove current buffer from hotlist\n" -" hotlist_restore_buffer: restore latest hotlist removed in the current " -"buffer\n" -" hotlist_restore_all: restore latest hotlist removed in all buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, default is " "500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 449d94442..90d399ee6 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -3269,6 +3269,43 @@ COMMAND_CALLBACK(history) return WEECHAT_RC_OK; } +/* + * Callback for command "/hotlist": manages hotlist. + */ + +COMMAND_CALLBACK(hotlist) +{ + /* make C compiler happy */ + (void) pointer; + (void) data; + (void) argv_eol; + + COMMAND_MIN_ARGS(2, ""); + + if (string_strcasecmp (argv[1], "clear") == 0) + { + gui_hotlist_clear_level_string (buffer, (argc > 2) ? argv[2] : NULL); + return WEECHAT_RC_OK; + } + + if (string_strcasecmp (argv[1], "remove") == 0) + { + gui_hotlist_remove_buffer (buffer, 1); + return WEECHAT_RC_OK; + } + + if (string_strcasecmp (argv[1], "restore") == 0) + { + if ((argc > 2) && (string_strcasecmp (argv[2], "-all") == 0)) + gui_hotlist_restore_all_buffers (); + else + gui_hotlist_restore_buffer (buffer); + return WEECHAT_RC_OK; + } + + COMMAND_ERROR; +} + /* * Callback for command "/input": input actions (used by key bindings). */ @@ -3345,14 +3382,6 @@ COMMAND_CALLBACK(input) gui_input_history_global_previous (buffer); else if (string_strcasecmp (argv[1], "history_global_next") == 0) gui_input_history_global_next (buffer); - else if (string_strcasecmp (argv[1], "hotlist_clear") == 0) - gui_input_hotlist_clear (buffer, (argc > 2) ? argv[2] : NULL); - else if (string_strcasecmp (argv[1], "hotlist_remove_buffer") == 0) - gui_input_hotlist_remove_buffer (buffer); - else if (string_strcasecmp (argv[1], "hotlist_restore_buffer") == 0) - gui_input_hotlist_restore_buffer (buffer); - else if (string_strcasecmp (argv[1], "hotlist_restore_all") == 0) - gui_input_hotlist_restore_all (); else if (string_strcasecmp (argv[1], "grab_key") == 0) gui_input_grab_key (buffer, 0, (argc > 2) ? argv[2] : NULL); else if (string_strcasecmp (argv[1], "grab_key_command") == 0) @@ -3412,6 +3441,18 @@ COMMAND_CALLBACK(input) /* since WeeChat 3.8: "/buffer jump next_visited" */ else if (string_strcasecmp (argv[1], "jump_next_visited_buffer") == 0) gui_buffer_jump_next_visited_buffer (gui_current_window); + /* since WeeChat 3.8: "/hotlist clear" */ + else if (string_strcasecmp (argv[1], "hotlist_clear") == 0) + gui_hotlist_clear_level_string (buffer, (argc > 2) ? argv[2] : NULL); + /* since WeeChat 3.8: "/hotlist remove" */ + else if (string_strcasecmp (argv[1], "hotlist_remove_buffer") == 0) + gui_hotlist_remove_buffer (buffer, 1); + /* since WeeChat 3.8: "/hotlist restore" */ + else if (string_strcasecmp (argv[1], "hotlist_restore_buffer") == 0) + gui_hotlist_restore_buffer (buffer); + /* since WeeChat 3.8: "/hotlist restore -all" */ + else if (string_strcasecmp (argv[1], "hotlist_restore_all") == 0) + gui_hotlist_restore_all_buffers (); else COMMAND_ERROR; } @@ -8023,6 +8064,21 @@ command_init () "value: number of history entries to show"), "clear", &command_history, NULL, NULL); + hook_command ( + NULL, "hotlist", + N_("manage hotlist"), + N_("clear [] || remove || restore [-all]"), + N_("clear: clear hotlist\n" + "level: \"lowest\" to clear only lowest level in hotlist, " + "highest\" to clear only highest level in hotlist, or level mask: " + "integer which is a combination of 1=join/part, 2=message, " + "4=private, 8=highlight)\n" + "remove: remove current buffer from hotlist\n" + "restore: restore latest hotlist removed in the current buffer " + "(or all buffers with -all)"), + "clear 1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|lowest|highest || " + "remove || restore -all", + &command_hotlist, NULL, NULL); /* * give high priority (50000) so that an alias will not take precedence * over this command @@ -8069,15 +8125,6 @@ command_init () " history_next: recall next command in current buffer history\n" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" - " hotlist_clear: clear hotlist (optional argument: \"lowest\" to " - "clear only lowest level in hotlist, \"highest\" to clear only " - "highest level in hotlist, or level mask: integer which is a " - "combination of 1=join/part, 2=message, 4=private, 8=highlight)\n" - " hotlist_remove_buffer: remove current buffer from hotlist\n" - " hotlist_restore_buffer: restore latest hotlist removed in the " - "current buffer\n" - " hotlist_restore_all: restore latest hotlist removed in all " - "buffers\n" " grab_key: grab a key (optional argument: delay for end of grab, " "default is 500 milliseconds)\n" " grab_key_command: grab a key with its associated command (optional " @@ -8111,9 +8158,6 @@ command_init () "move_next_char || move_previous_word || move_next_word || " "history_previous || history_next || history_global_previous || " "history_global_next || " - "hotlist_clear 1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|lowest|highest || " - "hotlist_remove_buffer || hotlist_restore_buffer || " - "hotlist_restore_all || " "grab_key || grab_key_command || grab_mouse || grab_mouse_area || " "set_unread || set_unread_current_buffer || " "switch_active_buffer || switch_active_buffer_previous || " diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c index 0d9ac53c6..89b0c31e2 100644 --- a/src/gui/curses/gui-curses-key.c +++ b/src/gui/curses/gui-curses-key.c @@ -138,10 +138,10 @@ gui_key_default_bindings (int context) BIND(/* m-j,m-l */ "meta-jmeta-l", "/buffer +"); BIND(/* m-j,m-r */ "meta-jmeta-r", "/server raw"); BIND(/* m-j,m-s */ "meta-jmeta-s", "/server jump"); - BIND(/* m-h,m-c */ "meta-hmeta-c", "/input hotlist_clear"); - BIND(/* m-h,m-m */ "meta-hmeta-m", "/input hotlist_remove_buffer"); - BIND(/* m-h,m-r */ "meta-hmeta-r", "/input hotlist_restore_buffer"); - BIND(/* m-h,m-R */ "meta-hmeta-R", "/input hotlist_restore_all"); + BIND(/* m-h,m-c */ "meta-hmeta-c", "/hotlist clear"); + BIND(/* m-h,m-m */ "meta-hmeta-m", "/hotlist remove"); + BIND(/* m-h,m-r */ "meta-hmeta-r", "/hotlist restore"); + BIND(/* m-h,m-R */ "meta-hmeta-R", "/hotlist restore -all"); BIND(/* m-k */ "meta-k", "/input grab_key_command"); BIND(/* m-s */ "meta-s", "/mute spell toggle"); BIND(/* m-u */ "meta-u", "/window scroll_unread"); diff --git a/src/gui/gui-hotlist.c b/src/gui/gui-hotlist.c index 4bf985949..9debccc9e 100644 --- a/src/gui/gui-hotlist.c +++ b/src/gui/gui-hotlist.c @@ -484,6 +484,23 @@ gui_hotlist_restore_buffer (struct t_gui_buffer *buffer) gui_hotlist_changed_signal (buffer); } +/* + * Restores latest hotlist removed in all buffers. + */ + +void +gui_hotlist_restore_all_buffers () +{ + struct t_gui_buffer *ptr_buffer; + + for (ptr_buffer = gui_buffers; ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer) + { + gui_hotlist_restore_buffer (ptr_buffer); + } +} + + /* * Resorts hotlist with new sort type. */ @@ -522,7 +539,7 @@ gui_hotlist_resort () } /* - * Clears hotlist. + * Clears hotlist with a level mask (integer). * * Argument "level_mask" is a combination of: * 1 = join/part @@ -560,6 +577,72 @@ gui_hotlist_clear (int level_mask) gui_hotlist_changed_signal (NULL); } +/* + * Clears hotlist with a level mask (string). + */ + +void +gui_hotlist_clear_level_string (struct t_gui_buffer *buffer, + const char *str_level_mask) +{ + long level_mask; + char *error; + struct t_gui_hotlist *ptr_hotlist; + int priority; + + if (str_level_mask) + { + if (strcmp (str_level_mask, "lowest") == 0) + { + /* clear only lowest priority currently in hotlist */ + priority = GUI_HOTLIST_MAX + 1; + for (ptr_hotlist = gui_hotlist; ptr_hotlist; + ptr_hotlist = ptr_hotlist->next_hotlist) + { + if ((int)ptr_hotlist->priority < priority) + priority = ptr_hotlist->priority; + } + if (priority <= GUI_HOTLIST_MAX) + { + gui_hotlist_clear (1 << priority); + gui_hotlist_initial_buffer = buffer; + } + } + else if (strcmp (str_level_mask, "highest") == 0) + { + /* clear only highest priority currently in hotlist */ + priority = GUI_HOTLIST_MIN - 1; + for (ptr_hotlist = gui_hotlist; ptr_hotlist; + ptr_hotlist = ptr_hotlist->next_hotlist) + { + if ((int)ptr_hotlist->priority > priority) + priority = ptr_hotlist->priority; + } + if (priority >= GUI_HOTLIST_MIN) + { + gui_hotlist_clear (1 << priority); + gui_hotlist_initial_buffer = buffer; + } + } + else + { + /* clear hotlist using a mask of levels */ + error = NULL; + level_mask = strtol (str_level_mask, &error, 10); + if (error && !error[0] && (level_mask > 0)) + { + gui_hotlist_clear ((int)level_mask); + gui_hotlist_initial_buffer = buffer; + } + } + } + else + { + gui_hotlist_clear (GUI_HOTLIST_MASK_MAX); + gui_hotlist_initial_buffer = buffer; + } +} + /* * Removes a buffer from hotlist. */ diff --git a/src/gui/gui-hotlist.h b/src/gui/gui-hotlist.h index 4f7235c56..f7876f500 100644 --- a/src/gui/gui-hotlist.h +++ b/src/gui/gui-hotlist.h @@ -62,8 +62,11 @@ extern struct t_gui_hotlist *gui_hotlist_add (struct t_gui_buffer *buffer, enum t_gui_hotlist_priority priority, struct timeval *creation_time); extern void gui_hotlist_restore_buffer (struct t_gui_buffer *buffer); +extern void gui_hotlist_restore_all_buffers (); extern void gui_hotlist_resort (); extern void gui_hotlist_clear (int level_mask); +extern void gui_hotlist_clear_level_string (struct t_gui_buffer *buffer, + const char *str_level_mask); extern void gui_hotlist_remove_buffer (struct t_gui_buffer *buffer, int force_remove_buffer); extern struct t_hdata *gui_hotlist_hdata_hotlist_cb (const void *pointer, diff --git a/src/gui/gui-input.c b/src/gui/gui-input.c index 3208ca08d..df8cdebfe 100644 --- a/src/gui/gui-input.c +++ b/src/gui/gui-input.c @@ -1460,108 +1460,6 @@ gui_input_history_global_next (struct t_gui_buffer *buffer) } } -/* - * Clears hotlist (default key: alt-h, alt-c). - */ - -void -gui_input_hotlist_clear (struct t_gui_buffer *buffer, - const char *str_level_mask) -{ - long level_mask; - char *error; - struct t_gui_hotlist *ptr_hotlist; - int priority; - - if (str_level_mask) - { - if (strcmp (str_level_mask, "lowest") == 0) - { - /* clear only lowest priority currently in hotlist */ - priority = GUI_HOTLIST_MAX + 1; - for (ptr_hotlist = gui_hotlist; ptr_hotlist; - ptr_hotlist = ptr_hotlist->next_hotlist) - { - if ((int)ptr_hotlist->priority < priority) - priority = ptr_hotlist->priority; - } - if (priority <= GUI_HOTLIST_MAX) - { - gui_hotlist_clear (1 << priority); - gui_hotlist_initial_buffer = buffer; - } - } - else if (strcmp (str_level_mask, "highest") == 0) - { - /* clear only highest priority currently in hotlist */ - priority = GUI_HOTLIST_MIN - 1; - for (ptr_hotlist = gui_hotlist; ptr_hotlist; - ptr_hotlist = ptr_hotlist->next_hotlist) - { - if ((int)ptr_hotlist->priority > priority) - priority = ptr_hotlist->priority; - } - if (priority >= GUI_HOTLIST_MIN) - { - gui_hotlist_clear (1 << priority); - gui_hotlist_initial_buffer = buffer; - } - } - else - { - /* clear hotlist using a mask of levels */ - error = NULL; - level_mask = strtol (str_level_mask, &error, 10); - if (error && !error[0] && (level_mask > 0)) - { - gui_hotlist_clear ((int)level_mask); - gui_hotlist_initial_buffer = buffer; - } - } - } - else - { - gui_hotlist_clear (GUI_HOTLIST_MASK_MAX); - gui_hotlist_initial_buffer = buffer; - } -} - -/* - * Removes buffer from hotlist (default key: alt-h, alt-m). - */ - -void -gui_input_hotlist_remove_buffer (struct t_gui_buffer *buffer) -{ - gui_hotlist_remove_buffer (buffer, 1); -} - -/* - * Restores latest hotlist removed in a buffer (default key: alt-h, alt-r). - */ - -void -gui_input_hotlist_restore_buffer (struct t_gui_buffer *buffer) -{ - gui_hotlist_restore_buffer (buffer); -} - -/* - * Restores latest hotlist removed in all buffers (default key: alt-h, alt-R). - */ - -void -gui_input_hotlist_restore_all () -{ - struct t_gui_buffer *ptr_buffer; - - for (ptr_buffer = gui_buffers; ptr_buffer; - ptr_buffer = ptr_buffer->next_buffer) - { - gui_hotlist_restore_buffer (ptr_buffer); - } -} - /* * Initializes "grab key mode" (next key will be inserted into input buffer) * (default key: alt-k). diff --git a/src/gui/gui-input.h b/src/gui/gui-input.h index 49e6c1eb2..035e6f8dd 100644 --- a/src/gui/gui-input.h +++ b/src/gui/gui-input.h @@ -72,11 +72,6 @@ extern void gui_input_history_local_previous (struct t_gui_buffer *buffer); extern void gui_input_history_local_next (struct t_gui_buffer *buffer); extern void gui_input_history_global_previous (struct t_gui_buffer *buffer); extern void gui_input_history_global_next (struct t_gui_buffer *buffer); -extern void gui_input_hotlist_clear (struct t_gui_buffer *buffer, - const char *level_mask); -extern void gui_input_hotlist_remove_buffer (struct t_gui_buffer *buffer); -extern void gui_input_hotlist_restore_buffer (struct t_gui_buffer *buffer); -extern void gui_input_hotlist_restore_all (); extern void gui_input_grab_key (struct t_gui_buffer *buffer, int command, const char *delay); extern void gui_input_grab_mouse (struct t_gui_buffer *buffer, int area); diff --git a/tests/unit/gui/test-gui-input.cpp b/tests/unit/gui/test-gui-input.cpp index a0dfac7a8..71108f270 100644 --- a/tests/unit/gui/test-gui-input.cpp +++ b/tests/unit/gui/test-gui-input.cpp @@ -782,46 +782,6 @@ TEST(GuiInput, HistoryGlobalNext) /* TODO: write tests */ } -/* - * Tests functions: - * gui_input_hotlist_clear - */ - -TEST(GuiInput, HotlistClear) -{ - /* TODO: write tests */ -} - -/* - * Tests functions: - * gui_input_hotlist_remove_buffer - */ - -TEST(GuiInput, HotlistRemoveBuffer) -{ - /* TODO: write tests */ -} - -/* - * Tests functions: - * gui_input_hotlist_restore_buffer - */ - -TEST(GuiInput, HotlistRestoreBuffer) -{ - /* TODO: write tests */ -} - -/* - * Tests functions: - * gui_input_hotlist_restore_all - */ - -TEST(GuiInput, HotlistRestoreAll) -{ - /* TODO: write tests */ -} - /* * Tests functions: * gui_input_grab_key