diff --git a/ChangeLog b/ChangeLog index 89f2cc4c5..7d7c46cbe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.3.5-dev, 2011-03-03 +v0.3.5-dev, 2011-03-04 Version 0.3.5 (under dev!) @@ -30,7 +30,8 @@ Version 0.3.5 (under dev!) * core: allow background for nick colors (using ":") * irc: fix crash when setting wrong value in option irc.server.xxx.sasl_mechanism (bug #32670) -* irc: add new option irc.look.color_nicks_in_nicklist +* irc: add new options irc.look.color_nicks_in_nicklist and + irc.look.color_nicks_in_names * irc: fix crash when completing /part command on a non-irc buffer (bug #32402) * irc: add many missing commands for target buffer (options irc.msgbuffer.xxx) (bug #32216) diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index 313e73850..6d00f45db 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -73,6 +73,11 @@ ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute werden vor einer Farbe gesetzt (ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `default`) +* *irc.look.color_nicks_in_names* +** Beschreibung: `use nick color in output of /names (or list of nicks displayed when joining a channel)` +** Typ: boolesch +** Werte: on, off (Standardwert: `off`) + * *irc.look.color_nicks_in_nicklist* ** Beschreibung: `Nutze Nickfarbe in Nicklist` ** Typ: boolesch diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 3fddeea87..8cccb4ec6 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -73,6 +73,11 @@ ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (default value: `default`) +* *irc.look.color_nicks_in_names* +** description: `use nick color in output of /names (or list of nicks displayed when joining a channel)` +** type: boolean +** values: on, off (default value: `off`) + * *irc.look.color_nicks_in_nicklist* ** description: `use nick color in nicklist` ** type: boolean diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index 301305283..51f125e74 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -73,6 +73,11 @@ ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour du gras, "!" pour la vidéo inverse, "_" pour du souligné (valeur par défaut: `default`) +* *irc.look.color_nicks_in_names* +** description: `utiliser la couleur du pseudo dans la sortie de /names (ou la liste des pseudos affichée lorsqu'on rejoint un canal)` +** type: booléen +** valeurs: on, off (valeur par défaut: `off`) + * *irc.look.color_nicks_in_nicklist* ** description: `utiliser la couleur du pseudo dans la liste des pseudos` ** type: booléen diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index 664ec4663..fb49b6db7 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -73,6 +73,11 @@ ** tipo: colore ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "_" for underline (valore predefinito: `default`) +* *irc.look.color_nicks_in_names* +** descrizione: `use nick color in output of /names (or list of nicks displayed when joining a channel)` +** tipo: bool +** valori: on, off (valore predefinito: `off`) + * *irc.look.color_nicks_in_nicklist* ** descrizione: `use nick color in nicklist` ** tipo: bool diff --git a/po/cs.po b/po/cs.po index fb5272e76..181ba0b07 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-02-25 23:15+0100\n" +"POT-Creation-Date: 2011-03-04 13:51+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -4912,6 +4912,11 @@ msgstr "%s%s: chyba při vytváření serveru \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: chyba při vytváření volby serveru \"%s\"" +msgid "" +"use nick color in output of /names (or list of nicks displayed when joining " +"a channel)" +msgstr "" + #, fuzzy msgid "use nick color in nicklist" msgstr "barva textu pro skupiny v seznamu přezdívek" diff --git a/po/de.po b/po/de.po index b8972cb06..066ba90e2 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-02-25 23:15+0100\n" +"POT-Creation-Date: 2011-03-04 13:51+0100\n" "PO-Revision-Date: 2011-02-24 19:23+0100\n" "Last-Translator: Nils G.\n" "Language-Team: weechat-dev \n" @@ -5111,6 +5111,11 @@ msgstr "%s%s: Fehler bei der Erstellung des Servers \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: Fehler bei der Erstellung der Server-Option \"%s\"" +msgid "" +"use nick color in output of /names (or list of nicks displayed when joining " +"a channel)" +msgstr "" + msgid "use nick color in nicklist" msgstr "Nutze Nickfarbe in Nicklist" diff --git a/po/es.po b/po/es.po index aa6b6c540..ef1d48025 100644 --- a/po/es.po +++ b/po/es.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-02-25 23:15+0100\n" +"POT-Creation-Date: 2011-03-04 13:51+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -5023,6 +5023,11 @@ msgstr "%s%s: error al crear el servidor \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: error al crear la opción \"%s\" del servidor" +msgid "" +"use nick color in output of /names (or list of nicks displayed when joining " +"a channel)" +msgstr "" + #, fuzzy msgid "use nick color in nicklist" msgstr "color para grupos en la lista de apodos" diff --git a/po/fr.po b/po/fr.po index 0b4c6f4f1..acaad4ad3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-02-25 23:15+0100\n" -"PO-Revision-Date: 2011-02-25 23:14+0100\n" +"POT-Creation-Date: 2011-03-04 13:51+0100\n" +"PO-Revision-Date: 2011-03-04 14:05+0100\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -5017,6 +5017,13 @@ msgstr "%s%s: erreur de création du serveur \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: erreur de création de l'option serveur \"%s\"" +msgid "" +"use nick color in output of /names (or list of nicks displayed when joining " +"a channel)" +msgstr "" +"utiliser la couleur du pseudo dans la sortie de /names (ou la liste des " +"pseudos affichée lorsqu'on rejoint un canal)" + msgid "use nick color in nicklist" msgstr "utiliser la couleur du pseudo dans la liste des pseudos" diff --git a/po/hu.po b/po/hu.po index 056719d52..85dcb72d8 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-02-25 23:15+0100\n" +"POT-Creation-Date: 2011-03-04 13:51+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4592,6 +4592,11 @@ msgstr "%s nincs elég memória az információs pult üzenethez\n" msgid "%s%s: error creating server option \"%s\"" msgstr "%s nincs elég memória az információs pult üzenethez\n" +msgid "" +"use nick color in output of /names (or list of nicks displayed when joining " +"a channel)" +msgstr "" + #, fuzzy msgid "use nick color in nicklist" msgstr "név színe" diff --git a/po/it.po b/po/it.po index 45c6bb012..373882b01 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-02-25 23:15+0100\n" +"POT-Creation-Date: 2011-03-04 13:51+0100\n" "PO-Revision-Date: 2011-02-22 19:26+0100\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -4937,6 +4937,11 @@ msgstr "%s%s: errore durante la creazione del server \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: errore durante la creazione dell'opzione del server \"%s\"" +msgid "" +"use nick color in output of /names (or list of nicks displayed when joining " +"a channel)" +msgstr "" + #, fuzzy msgid "use nick color in nicklist" msgstr "colore del testo per i gruppi nella lista nick" diff --git a/po/pl.po b/po/pl.po index 2f647dcaa..841510aa4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-02-25 23:15+0100\n" +"POT-Creation-Date: 2011-03-04 13:51+0100\n" "PO-Revision-Date: 2011-02-07 17:29+0100\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" @@ -5003,6 +5003,11 @@ msgstr "%s%s: błąd podczas tworzenia serwera \"%s\"" msgid "%s%s: error creating server option \"%s\"" msgstr "%s%s: błąd podczas tworzenia opcji dla serwera \"%s\"" +msgid "" +"use nick color in output of /names (or list of nicks displayed when joining " +"a channel)" +msgstr "" + #, fuzzy msgid "use nick color in nicklist" msgstr "kolor grup na liście nicków" diff --git a/po/pt_BR.po b/po/pt_BR.po index 749ad89be..24ab81a87 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-02-25 23:15+0100\n" +"POT-Creation-Date: 2011-03-04 13:51+0100\n" "PO-Revision-Date: 2011-02-07 17:30+0100\n" "Last-Translator: Ivan Sichmann Freitas \n" "Language-Team: weechat-dev \n" @@ -4434,6 +4434,11 @@ msgstr "" msgid "%s%s: error creating server option \"%s\"" msgstr "" +msgid "" +"use nick color in output of /names (or list of nicks displayed when joining " +"a channel)" +msgstr "" + msgid "use nick color in nicklist" msgstr "" diff --git a/po/ru.po b/po/ru.po index 18726a1c5..85b7e606c 100644 --- a/po/ru.po +++ b/po/ru.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.5-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-02-25 23:15+0100\n" +"POT-Creation-Date: 2011-03-04 13:51+0100\n" "PO-Revision-Date: 2011-02-07 17:30+0100\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -4599,6 +4599,11 @@ msgstr "%s недостаточно памяти для сообщения в с msgid "%s%s: error creating server option \"%s\"" msgstr "%s недостаточно памяти для сообщения в строке информации\n" +msgid "" +"use nick color in output of /names (or list of nicks displayed when joining " +"a channel)" +msgstr "" + #, fuzzy msgid "use nick color in nicklist" msgstr "цвет ника" diff --git a/po/weechat.pot b/po/weechat.pot index 9bc80ba3e..d5c94b718 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-02-25 23:15+0100\n" +"POT-Creation-Date: 2011-03-04 13:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3901,6 +3901,11 @@ msgstr "" msgid "%s%s: error creating server option \"%s\"" msgstr "" +msgid "" +"use nick color in output of /names (or list of nicks displayed when joining " +"a channel)" +msgstr "" + msgid "use nick color in nicklist" msgstr "" diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 7eadd3cf4..4c5ef2995 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -50,6 +50,7 @@ struct t_config_section *irc_config_section_server = NULL; /* IRC config, look section */ +struct t_config_option *irc_config_look_color_nicks_in_names; struct t_config_option *irc_config_look_color_nicks_in_nicklist; struct t_config_option *irc_config_look_color_nicks_in_server_messages; struct t_config_option *irc_config_look_color_pv_nick_like_channel; @@ -1791,6 +1792,13 @@ irc_config_init () return 0; } + irc_config_look_color_nicks_in_names = weechat_config_new_option ( + irc_config_file, ptr_section, + "color_nicks_in_names", "boolean", + N_("use nick color in output of /names (or list of nicks displayed " + "when joining a channel)"), + NULL, 0, 0, "off", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); irc_config_look_color_nicks_in_nicklist = weechat_config_new_option ( irc_config_file, ptr_section, "color_nicks_in_nicklist", "boolean", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 890617df3..2902af8ee 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -75,6 +75,7 @@ extern struct t_config_section *irc_config_section_ctcp; extern struct t_config_section *irc_config_section_server_default; extern struct t_config_section *irc_config_section_server; +extern struct t_config_option *irc_config_look_color_nicks_in_names; extern struct t_config_option *irc_config_look_color_nicks_in_nicklist; extern struct t_config_option *irc_config_look_color_nicks_in_server_messages; extern struct t_config_option *irc_config_look_color_pv_nick_like_channel; diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index b3e7ab883..1ad558517 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -3539,7 +3539,7 @@ IRC_PROTOCOL_CALLBACK(366) struct t_config_option *ptr_option; int num_nicks, num_op, num_halfop, num_voice, num_normal, length, i; char *string; - const char *prefix; + const char *prefix, *nickname; /* * 366 message looks like: @@ -3568,7 +3568,7 @@ IRC_PROTOCOL_CALLBACK(366) length += ((ptr_option) ? strlen (weechat_color (weechat_config_string (ptr_option))) : 0) + strlen (weechat_infolist_string (infolist, "prefix")) + - strlen (IRC_COLOR_CHAT) + + 16 + /* nick color */ strlen (weechat_infolist_string (infolist, "name")) + 1; } } @@ -3597,8 +3597,17 @@ IRC_PROTOCOL_CALLBACK(366) strcat (string, weechat_color (weechat_config_string (ptr_option))); strcat (string, prefix); } - strcat (string, IRC_COLOR_CHAT); - strcat (string, weechat_infolist_string (infolist, "name")); + nickname = weechat_infolist_string (infolist, "name"); + if (weechat_config_boolean (irc_config_look_color_nicks_in_names)) + { + if (weechat_strcasecmp (nickname, server->nick) == 0) + strcat (string, IRC_COLOR_CHAT_NICK_SELF); + else + strcat (string, irc_nick_find_color (nickname)); + } + else + strcat (string, IRC_COLOR_CHAT); + strcat (string, nickname); i++; } }