diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 35842b9af..d36e58a56 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -34,6 +34,7 @@ New features:: * core: rename option weechat.color.status_name_ssl to weechat.color.status_name_tls * core, plugins: make many identifiers case sensitive (issue #1872, issue #398, bug #32213) * core: add item "mouse_status" in default status bar, change default color to lightgreen + * core: add options weechat.color.chat_status_disabled and weechat.color.chat_status_enabled (issue #1820) * api: add function config_set_version (issue #1238) * api: add optional argument with version in info "version_number" * alias: use lower case for default aliases, rename all aliases to lower case on upgrade (issue #1872) diff --git a/doc/en/weechat_dev.en.adoc b/doc/en/weechat_dev.en.adoc index 186e29882..eb26651fd 100644 --- a/doc/en/weechat_dev.en.adoc +++ b/doc/en/weechat_dev.en.adoc @@ -1022,6 +1022,8 @@ _src/gui/gui-color.h_): | 42 | weechat.color.emphasized _(WeeChat ≥ 0.4.2)_ | 43 | weechat.color.chat_day_change _(WeeChat ≥ 0.4.2)_ | 44 | weechat.color.chat_value_null _(WeeChat ≥ 1.4)_ +| 45 | weechat.color.chat_status_disabled _(WeeChat ≥ 4.0.0)_ +| 46 | weechat.color.chat_status_enabled _(WeeChat ≥ 4.0.0)_ |=== WeeChat colors are: diff --git a/doc/fr/weechat_dev.fr.adoc b/doc/fr/weechat_dev.fr.adoc index d27eeb816..af3ca9dc2 100644 --- a/doc/fr/weechat_dev.fr.adoc +++ b/doc/fr/weechat_dev.fr.adoc @@ -1040,6 +1040,8 @@ fichier _src/gui/gui-color.h_) : | 42 | weechat.color.emphasized _(WeeChat ≥ 0.4.2)_ | 43 | weechat.color.chat_day_change _(WeeChat ≥ 0.4.2)_ | 44 | weechat.color.chat_value_null _(WeeChat ≥ 1.4)_ +| 45 | weechat.color.chat_status_disabled _(WeeChat ≥ 4.0.0)_ +| 46 | weechat.color.chat_status_enabled _(WeeChat ≥ 4.0.0)_ |=== Les couleurs WeeChat sont : diff --git a/doc/ja/weechat_dev.ja.adoc b/doc/ja/weechat_dev.ja.adoc index dafeec5ae..141675d4c 100644 --- a/doc/ja/weechat_dev.ja.adoc +++ b/doc/ja/weechat_dev.ja.adoc @@ -1094,6 +1094,8 @@ could be used at same time in buffers). | 42 | weechat.color.emphasized _(WeeChat バージョン 0.4.2 以上で利用可)_ | 43 | weechat.color.chat_day_change _(WeeChat バージョン 0.4.2 以上で利用可)_ | 44 | weechat.color.chat_value_null _(WeeChat バージョン 1.4 以上で利用可)_ +| 45 | weechat.color.chat_status_disabled _(WeeChat バージョン 4.0.0 以上で利用可)_ +| 46 | weechat.color.chat_status_enabled _(WeeChat バージョン 4.0.0 以上で利用可)_ |=== WeeChat 色は: diff --git a/doc/sr/weechat_dev.sr.adoc b/doc/sr/weechat_dev.sr.adoc index d0e21cdad..8b47da752 100644 --- a/doc/sr/weechat_dev.sr.adoc +++ b/doc/sr/weechat_dev.sr.adoc @@ -998,6 +998,8 @@ struct t_gui_buffer *last_gui_buffer = NULL; /* last buffer */ | 42 | weechat.color.emphasized _(WeeChat ≥ 0.4.2)_ | 43 | weechat.color.chat_day_change _(WeeChat ≥ 0.4.2)_ | 44 | weechat.color.chat_value_null _(WeeChat ≥ 1.4)_ +| 45 | weechat.color.chat_status_disabled _(WeeChat ≥ 4.0.0)_ +| 46 | weechat.color.chat_status_enabled _(WeeChat ≥ 4.0.0)_ |=== Ово су WeeChat боје: diff --git a/po/cs.po b/po/cs.po index 4620190ae..e242de626 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -4094,6 +4094,16 @@ msgstr "barva pozadí pro značku nepřečtených dat" msgid "text color for server names" msgstr "barva textu pro jeméno serveru" +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"disabled\" status" +msgstr "barva textu pro status \"selhalo\"" + +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"enabled\" status" +msgstr "barva textu pro status \"selhalo\"" + #, fuzzy msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "barva textu pro počet ostatních zpráv v hostlistu (stavový řádek)" diff --git a/po/de.po b/po/de.po index c15cd32b2..028035536 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2023-05-01 18:10+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German - Germany \n" @@ -5209,6 +5209,16 @@ msgstr "Hintergrundfarbe für das Lesezeichen" msgid "text color for server names" msgstr "Textfarbe für den Namen des Servers" +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"disabled\" status" +msgstr "Textfarbe für Status: \"fehlgeschlagen\"" + +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"enabled\" status" +msgstr "Textfarbe für Status: \"fehlgeschlagen\"" + msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "" "Textfarbe in der die Schlagwörter, die nach der jeweiligen Nachricht " diff --git a/po/es.po b/po/es.po index 7145a179a..427dd36f5 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -4702,6 +4702,16 @@ msgstr "color de fondo para el marcador de datos sin leer" msgid "text color for server names" msgstr "color para los nombres de los servidores" +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"disabled\" status" +msgstr "color de texto para el estado \"falló\"" + +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"enabled\" status" +msgstr "color de texto para el estado \"falló\"" + msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "" "color para las etiquetas de mensaje (mostrados con el comando /debug tags)" diff --git a/po/fr.po b/po/fr.po index 17516073c..59bc0e5cb 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-05-01 17:48+0200\n" -"PO-Revision-Date: 2023-05-01 17:49+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" +"PO-Revision-Date: 2023-05-01 20:10+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -5075,6 +5075,12 @@ msgstr "couleur du fond pour le marqueur de lecture" msgid "text color for server names" msgstr "couleur du texte pour le nom des serveurs" +msgid "text color for \"disabled\" status" +msgstr "couleur du texte pour le statut \"désactivé\"" + +msgid "text color for \"enabled\" status" +msgstr "couleur du texte pour le statut \"activé\"" + msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "" "couleur du texte pour les étiquettes après les messages (affichées avec la " diff --git a/po/hu.po b/po/hu.po index cf0a854a7..93778ea11 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -3642,6 +3642,14 @@ msgstr "olvasatlan adat jelölő háttere" msgid "text color for server names" msgstr "szerver nevének színe" +#, fuzzy +msgid "text color for \"disabled\" status" +msgstr "\"failed\" dcc státusz színe" + +#, fuzzy +msgid "text color for \"enabled\" status" +msgstr "\"failed\" dcc státusz színe" + #, fuzzy msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)" diff --git a/po/it.po b/po/it.po index 9752fef6f..4a60d1553 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -4331,6 +4331,16 @@ msgstr "colore di sfondo per l'evidenziatore di dati non letti" msgid "text color for server names" msgstr "colore del testo per i nomi dei server" +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"disabled\" status" +msgstr "colore del testo per lo status \"fallito\"" + +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"enabled\" status" +msgstr "colore del testo per lo status \"fallito\"" + msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "" "colore del testo per i tago dopo i messaggi (mostrati con il comando /debug " diff --git a/po/ja.po b/po/ja.po index 5b1372804..acd749740 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: Polish \n" @@ -5366,6 +5366,16 @@ msgstr "kolor tła znacznika nieprzeczytanych wiadomości" msgid "text color for server names" msgstr "kolor nazw serwerów" +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"disabled\" status" +msgstr "kolor statusu \"failed\"" + +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"enabled\" status" +msgstr "kolor statusu \"failed\"" + msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "" "kolor tekstu dla tagów po wiadomościach (wyświetlanych za pomocą komendy /" diff --git a/po/pt.po b/po/pt.po index e11644c37..ee5d731c8 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -4963,6 +4963,16 @@ msgstr "cor de fundo do marcador de dados não lidos" msgid "text color for server names" msgstr "cor de texto do nome dos servidores" +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"disabled\" status" +msgstr "cor do texto do estdo \"falhou\"" + +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"enabled\" status" +msgstr "cor do texto do estdo \"falhou\"" + msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "" "cor do texto das tags depois das mensagens (apresentadas com o comando /" diff --git a/po/pt_BR.po b/po/pt_BR.po index 0ae77cb65..7fffba3da 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -4344,6 +4344,16 @@ msgstr "cor de fundo para marcador de dados não lidos" msgid "text color for server names" msgstr "cor do texto para nomes de servidor" +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"disabled\" status" +msgstr "cor do texto para o status \"falhou\"" + +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"enabled\" status" +msgstr "cor do texto para o status \"falhou\"" + msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "" "cor de texto para marcadores de mensagens (mostrados com o comando /debug " diff --git a/po/ru.po b/po/ru.po index e46bfa577..4b59e354b 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2023-03-25 21:13+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -3674,6 +3674,14 @@ msgstr "фон маркера непрочитанных сообщений" msgid "text color for server names" msgstr "цвет названия сервера" +#, fuzzy +msgid "text color for \"disabled\" status" +msgstr "цвет \"неудачных\" в окне DCC" + +#, fuzzy +msgid "text color for \"enabled\" status" +msgstr "цвет \"неудачных\" в окне DCC" + #, fuzzy msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "цвет окна с подсвеченным сообщением (в строке состояния)" diff --git a/po/sr.po b/po/sr.po index 63444f54a..91938c56e 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2023-04-13 20:10+0200\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -5347,6 +5347,16 @@ msgstr "боја позадине за маркер непрочитаних п msgid "text color for server names" msgstr "боја текста за имена сервера" +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"disabled\" status" +msgstr "боја текста за „није успео” статус" + +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"enabled\" status" +msgstr "боја текста за „није успео” статус" + msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "боја текста за ознаке након порука (приказаних командом /debug tags)" diff --git a/po/tr.po b/po/tr.po index 072b3d1c7..a5e5f8a0e 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2023-04-23 16:51+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -5014,6 +5014,16 @@ msgstr "okunmamış veri imleyicisi arka plan rengi" msgid "text color for server names" msgstr "sunucu adları metin rengi" +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"disabled\" status" +msgstr "\"failed\" durumu metin rengi" + +#, fuzzy +#| msgid "text color for \"failed\" status" +msgid "text color for \"enabled\" status" +msgstr "\"failed\" durumu metin rengi" + msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "" "iletilerden sonraki etiket metin rengi (/debug tags komutu ile görüntülenir)" diff --git a/po/weechat.pot b/po/weechat.pot index 3772e1eda..c54b5d0a5 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-05-01 17:48+0200\n" +"POT-Creation-Date: 2023-05-01 20:10+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -3350,6 +3350,12 @@ msgstr "" msgid "text color for server names" msgstr "" +msgid "text color for \"disabled\" status" +msgstr "" + +msgid "text color for \"enabled\" status" +msgstr "" + msgid "text color for tags after messages (displayed with command /debug tags)" msgstr "" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 748392f6f..c88759afa 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -255,6 +255,8 @@ struct t_config_option *config_color_chat_prefix_suffix = NULL; struct t_config_option *config_color_chat_read_marker = NULL; struct t_config_option *config_color_chat_read_marker_bg = NULL; struct t_config_option *config_color_chat_server = NULL; +struct t_config_option *config_color_chat_status_disabled = NULL; +struct t_config_option *config_color_chat_status_enabled = NULL; struct t_config_option *config_color_chat_tags = NULL; struct t_config_option *config_color_chat_text_found = NULL; struct t_config_option *config_color_chat_text_found_bg = NULL; @@ -4318,6 +4320,22 @@ config_weechat_init_options () NULL, NULL, NULL, &config_change_color, NULL, NULL, NULL, NULL, NULL); + config_color_chat_status_disabled = config_file_new_option ( + weechat_config_file, weechat_config_section_color, + "chat_status_disabled", "color", + N_("text color for \"disabled\" status"), + NULL, GUI_COLOR_CHAT_STATUS_DISABLED, 0, "red", NULL, 0, + NULL, NULL, NULL, + &config_change_color, NULL, NULL, + NULL, NULL, NULL); + config_color_chat_status_enabled = config_file_new_option ( + weechat_config_file, weechat_config_section_color, + "chat_status_enabled", "color", + N_("text color for \"enabled\" status"), + NULL, GUI_COLOR_CHAT_STATUS_ENABLED, 0, "green", NULL, 0, + NULL, NULL, NULL, + &config_change_color, NULL, NULL, + NULL, NULL, NULL); config_color_chat_tags = config_file_new_option ( weechat_config_file, weechat_config_section_color, "chat_tags", "color", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index e9f901201..230158a8b 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -302,6 +302,8 @@ extern struct t_config_option *config_color_chat_prefix_suffix; extern struct t_config_option *config_color_chat_read_marker; extern struct t_config_option *config_color_chat_read_marker_bg; extern struct t_config_option *config_color_chat_server; +extern struct t_config_option *config_color_chat_status_disabled; +extern struct t_config_option *config_color_chat_status_enabled; extern struct t_config_option *config_color_chat_tags; extern struct t_config_option *config_color_chat_text_found; extern struct t_config_option *config_color_chat_text_found_bg; diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c index 3f96bca5f..26948eb0f 100644 --- a/src/gui/curses/gui-curses-color.c +++ b/src/gui/curses/gui-curses-color.c @@ -1570,6 +1570,8 @@ gui_color_init_weechat () gui_color_build (GUI_COLOR_EMPHASIS, CONFIG_COLOR(config_color_emphasized), CONFIG_COLOR(config_color_emphasized_bg)); gui_color_build (GUI_COLOR_CHAT_DAY_CHANGE, CONFIG_COLOR(config_color_chat_day_change), CONFIG_COLOR(config_color_chat_bg)); gui_color_build (GUI_COLOR_CHAT_VALUE_NULL, CONFIG_COLOR(config_color_chat_value_null), CONFIG_COLOR(config_color_chat_bg)); + gui_color_build (GUI_COLOR_CHAT_STATUS_DISABLED, CONFIG_COLOR(config_color_chat_status_disabled), CONFIG_COLOR(config_color_chat_bg)); + gui_color_build (GUI_COLOR_CHAT_STATUS_ENABLED, CONFIG_COLOR(config_color_chat_status_enabled), CONFIG_COLOR(config_color_chat_bg)); /* * define old nick colors for compatibility on /upgrade with previous diff --git a/src/gui/gui-color.h b/src/gui/gui-color.h index f9d40a37b..e13de6755 100644 --- a/src/gui/gui-color.h +++ b/src/gui/gui-color.h @@ -88,6 +88,8 @@ enum t_gui_color_enum GUI_COLOR_EMPHASIS, GUI_COLOR_CHAT_DAY_CHANGE, GUI_COLOR_CHAT_VALUE_NULL, + GUI_COLOR_CHAT_STATUS_DISABLED, + GUI_COLOR_CHAT_STATUS_ENABLED, /* number of colors */ GUI_COLOR_NUM_COLORS,