From d7a6fcba5f1b88df1dbff994f624cd3754a3945f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Tue, 20 Jun 2023 19:16:17 +0200 Subject: [PATCH] buflist: increase max number of buflist items from 3 to 5 (closes #1703) --- ChangeLog.adoc | 1 + po/cs.po | 6 +++--- po/de.po | 11 ++++++++--- po/es.po | 6 +++--- po/fr.po | 13 +++++++------ po/hu.po | 6 +++--- po/it.po | 6 +++--- po/ja.po | 6 +++--- po/pl.po | 11 ++++++++--- po/pt.po | 6 +++--- po/pt_BR.po | 6 +++--- po/ru.po | 6 +++--- po/sr.po | 11 ++++++++--- po/tr.po | 11 ++++++++--- po/weechat.pot | 6 +++--- src/plugins/buflist/buflist-bar-item.c | 7 ++++--- src/plugins/buflist/buflist-bar-item.h | 2 +- src/plugins/buflist/buflist-config.c | 12 +++++++----- 18 files changed, 79 insertions(+), 54 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index b2a33ffcc..4be62377e 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -17,6 +17,7 @@ New features:: * core: add variables "_chat_focused_line_bol" and "_chat_focused_line_eol" in focus data (issue #1955) * api: add info "buffer" (issue #1962) + * buflist: increase max number of buflist items from 3 to 5 (issue #1703) * irc: display commands 716/717 in private buffer (if present) (issue #146) * trigger: add options `-o`, `-ol`, `-i` and `-il` in command `/trigger list` (issue #1953) diff --git a/po/cs.po b/po/cs.po index 9cf86e1c8..fa74308c5 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -5555,8 +5555,8 @@ msgstr "" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" msgid "" diff --git a/po/de.po b/po/de.po index 755306b9d..4dbe60a1b 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-07-01 12:12+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -6988,10 +6988,15 @@ msgstr "" "Variable, die verwendet werden kann, um zwischen verschiedenen buflist-" "Elementen zu unterscheiden, zum Beispiel \"${bar_item.name}\")" +#, fuzzy +#| msgid "" +#| "number of buflist bar items that can be used; the item names are: " +#| "\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one " +#| "bar item slows down the display of buffers list" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" "Anzahl der Buflist-Bar-Items, die verwendet werden können; die Item-Namen " "sind: \"buflist\", \"buflist2\", \"buflist3\"; Seien Sie vorsichtig, wenn " diff --git a/po/es.po b/po/es.po index c00e89236..3d0a59ade 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -6177,8 +6177,8 @@ msgstr "" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" msgid "" diff --git a/po/fr.po b/po/fr.po index 9613ef9fa..811453b03 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: 2023-07-04 21:49+0200\n" -"PO-Revision-Date: 2023-07-04 21:53+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" +"PO-Revision-Date: 2023-07-04 22:00+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -6785,12 +6785,13 @@ msgstr "" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" "nombre d'objets de barre buflist qui peuvent être utilisés ; les objets de " -"barre sont : \"buflist\", \"buflist2\", \"buflist3\" ; attention, utiliser " -"plus d'un objet de barre ralentit l'affichage de la liste des tampons" +"barre sont : \"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" et " +"\"buflist5\" ; attention, utiliser plus d'un objet de barre ralentit " +"l'affichage de la liste des tampons" msgid "" "format of each line with a buffer (note: content is evaluated, see /help " diff --git a/po/hu.po b/po/hu.po index 482d325a8..5c59a2b7b 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-06-17 11:47+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -5070,8 +5070,8 @@ msgstr "" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" msgid "" diff --git a/po/it.po b/po/it.po index 29a1043d9..ba4693335 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -5839,8 +5839,8 @@ msgstr "" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" msgid "" diff --git a/po/ja.po b/po/ja.po index bf71ea9fa..7b96382be 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: Polish \n" @@ -7070,10 +7070,15 @@ msgstr "" "\"bar_item\" to jedyna zmienna, jaka może zostać użyta w celu rozróżnienia " "buforów, na przykład \"${bar_item.name}\")" +#, fuzzy +#| msgid "" +#| "number of buflist bar items that can be used; the item names are: " +#| "\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one " +#| "bar item slows down the display of buffers list" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" "ilość elementów „buflist” na pasku, które mogą zostać użyte; nazwy tych " "elementów to: \"buflist\", \"buflist2\", \"buflist3\"; używanie więcej niż " diff --git a/po/pt.po b/po/pt.po index 5bbfd37a0..b2ef3745c 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -6495,8 +6495,8 @@ msgstr "" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" msgid "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3dca51dff..457c1e374 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -5772,8 +5772,8 @@ msgstr "" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" msgid "" diff --git a/po/ru.po b/po/ru.po index 824084461..1ed487b98 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-06-17 11:47+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -5107,8 +5107,8 @@ msgstr "" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" msgid "" diff --git a/po/sr.po b/po/sr.po index d90dd1601..87fb6e813 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -6675,10 +6675,15 @@ msgstr "" "може да се користи, како би се направила разлика између различитих ставки " "листе бафера, на пример „${bar_item.name}”)" +#, fuzzy +#| msgid "" +#| "number of buflist bar items that can be used; the item names are: " +#| "\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one " +#| "bar item slows down the display of buffers list" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" "број buflist ставки траке које могу да се користе; имена ставки су: " "„buflist”, „buflist2”, „buflist3”; будите пажљиви, употреба више од једне " diff --git a/po/tr.po b/po/tr.po index e6abf1d28..26878d8af 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2023-06-26 21:34+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -6686,10 +6686,15 @@ msgstr "" "yalnızca buflist ögeleri arasında ayrım yapmak için kullanılabilecek tek " "değişkendir; örneğin: \"${bar_item.name}\")" +#, fuzzy +#| msgid "" +#| "number of buflist bar items that can be used; the item names are: " +#| "\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one " +#| "bar item slows down the display of buffers list" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" "kullanılabilecek buflist çubuk ögelerinin sayısı; öge adları: \"buflist\", " "\"buflist2\", \"buflist3\"; dikkatli olun, birden çok çubuk ögesi kullanmak " diff --git a/po/weechat.pot b/po/weechat.pot index 3156fed13..ebc9bf4cd 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: 2023-07-04 21:49+0200\n" +"POT-Creation-Date: 2023-07-04 22:00+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -4661,8 +4661,8 @@ msgstr "" msgid "" "number of buflist bar items that can be used; the item names are: " -"\"buflist\", \"buflist2\", \"buflist3\"; be careful, using more than one bar " -"item slows down the display of buffers list" +"\"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and \"buflist5\"; be " +"careful, using more than one bar item slows down the display of buffers list" msgstr "" msgid "" diff --git a/src/plugins/buflist/buflist-bar-item.c b/src/plugins/buflist/buflist-bar-item.c index d7dcc0868..f7cd9bbc7 100644 --- a/src/plugins/buflist/buflist-bar-item.c +++ b/src/plugins/buflist/buflist-bar-item.c @@ -30,14 +30,15 @@ struct t_gui_bar_item *buflist_bar_item_buflist[BUFLIST_BAR_NUM_ITEMS] = -{ NULL, NULL, NULL }; +{ NULL, NULL, NULL, NULL, NULL }; struct t_hashtable *buflist_hashtable_pointers = NULL; struct t_hashtable *buflist_hashtable_extra_vars = NULL; struct t_hashtable *buflist_hashtable_options_conditions = NULL; struct t_arraylist *buflist_list_buffers[BUFLIST_BAR_NUM_ITEMS] = -{ NULL, NULL, NULL }; +{ NULL, NULL, NULL, NULL, NULL }; -int old_line_number_current_buffer[BUFLIST_BAR_NUM_ITEMS] = { -1, -1, -1 }; +int old_line_number_current_buffer[BUFLIST_BAR_NUM_ITEMS] = +{ -1, -1, -1, -1, -1 }; /* diff --git a/src/plugins/buflist/buflist-bar-item.h b/src/plugins/buflist/buflist-bar-item.h index 043e6393c..e28f76df1 100644 --- a/src/plugins/buflist/buflist-bar-item.h +++ b/src/plugins/buflist/buflist-bar-item.h @@ -22,7 +22,7 @@ #define BUFLIST_BAR_ITEM_NAME "buflist" -#define BUFLIST_BAR_NUM_ITEMS 3 +#define BUFLIST_BAR_NUM_ITEMS 5 struct t_gui_bar_item; diff --git a/src/plugins/buflist/buflist-config.c b/src/plugins/buflist/buflist-config.c index ba2691f5d..03471ab14 100644 --- a/src/plugins/buflist/buflist-config.c +++ b/src/plugins/buflist/buflist-config.c @@ -70,8 +70,10 @@ struct t_config_option *buflist_config_format_tls_version = NULL; struct t_hook **buflist_config_signals_refresh = NULL; int buflist_config_num_signals_refresh = 0; -char **buflist_config_sort_fields[BUFLIST_BAR_NUM_ITEMS] = { NULL, NULL, NULL }; -int buflist_config_sort_fields_count[BUFLIST_BAR_NUM_ITEMS] = { 0, 0, 0 }; +char **buflist_config_sort_fields[BUFLIST_BAR_NUM_ITEMS] = +{ NULL, NULL, NULL, NULL, NULL }; +int buflist_config_sort_fields_count[BUFLIST_BAR_NUM_ITEMS] = +{ 0, 0, 0, 0, 0 }; char *buflist_config_format_buffer_eval = NULL; char *buflist_config_format_buffer_current_eval = NULL; char *buflist_config_format_hotlist_eval = NULL; @@ -622,9 +624,9 @@ buflist_config_init () buflist_config_file, buflist_config_section_look, "use_items", "integer", N_("number of buflist bar items that can be used; the item names " - "are: \"buflist\", \"buflist2\", \"buflist3\"; be careful, " - "using more than one bar item slows down the display of " - "buffers list"), + "are: \"buflist\", \"buflist2\", \"buflist3\", \"buflist4\" and " + "\"buflist5\"; be careful, using more than one bar item slows " + "down the display of buffers list"), NULL, 1, BUFLIST_BAR_NUM_ITEMS, "1", NULL, 0, NULL, NULL, NULL, &buflist_config_change_use_items, NULL, NULL,