diff --git a/ChangeLog b/ChangeLog index a29732ca1..f41707bb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= FlashCode -v0.3.3-dev, 2010-06-02 +v0.3.3-dev, 2010-06-04 Version 0.3.3 (under dev!) @@ -14,6 +14,7 @@ Version 0.3.3 (under dev!) process) * api: add function "string_expand_home", fix bug with replacement of home in paths +* irc: move options weechat.color.nicklist_prefix to irc plugin * irc: fix bug with command-line option "irc://" (bug #29990), new format for port and channels * irc: add command /wallchops, fix bug with display of notice for ops diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 9b9d2e088..d5db91e73 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -23,6 +23,26 @@ ** type: color ** values: a color name (default value: red) +* *irc.color.nick_prefix_halfop* +** description: color for prefix of nick which is halfop on channel +** type: color +** values: a color name (default value: lightmagenta) + +* *irc.color.nick_prefix_op* +** description: color for prefix of nick which is op/admin/owner on channel +** type: color +** values: a color name (default value: lightgreen) + +* *irc.color.nick_prefix_user* +** description: color for prefix of nick which is user on channel +** type: color +** values: a color name (default value: blue) + +* *irc.color.nick_prefix_voice* +** description: color for prefix of nick which has voice on channel +** type: color +** values: a color name (default value: yellow) + * *irc.color.notice* ** description: color for text "Notice" in notices ** type: color diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index 8c80335bd..f3a3e41eb 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -213,31 +213,6 @@ ** type: color ** values: a color name (default value: blue) -* *weechat.color.nicklist_prefix1* -** description: text color for prefix #1 in nicklist -** type: color -** values: a color name (default value: lightgreen) - -* *weechat.color.nicklist_prefix2* -** description: text color for prefix #2 in nicklist -** type: color -** values: a color name (default value: lightmagenta) - -* *weechat.color.nicklist_prefix3* -** description: text color for prefix #3 in nicklist -** type: color -** values: a color name (default value: yellow) - -* *weechat.color.nicklist_prefix4* -** description: text color for prefix #4 in nicklist -** type: color -** values: a color name (default value: blue) - -* *weechat.color.nicklist_prefix5* -** description: text color for prefix #5 in nicklist -** type: color -** values: a color name (default value: brown) - * *weechat.color.separator* ** description: background color for window separators (when split) ** type: color diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index d6338bb98..872d8ec32 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -23,6 +23,26 @@ ** type: couleur ** valeurs: un nom de couleur (valeur par défaut: red) +* *irc.color.nick_prefix_halfop* +** description: couleur pour le préfixe d'un pseudo qui est halfop sur le canal +** type: couleur +** valeurs: un nom de couleur (valeur par défaut: lightmagenta) + +* *irc.color.nick_prefix_op* +** description: couleur pour le préfixe d'un pseudo qui est op/admin/owner sur le canal +** type: couleur +** valeurs: un nom de couleur (valeur par défaut: lightgreen) + +* *irc.color.nick_prefix_user* +** description: couleur pour le préfixe d'un pseudo qui est user sur le canal +** type: couleur +** valeurs: un nom de couleur (valeur par défaut: blue) + +* *irc.color.nick_prefix_voice* +** description: couleur pour le préfixe d'un pseudo qui a le voice sur le canal +** type: couleur +** valeurs: un nom de couleur (valeur par défaut: yellow) + * *irc.color.notice* ** description: couleur pour le texte "Notice" dans les notices ** type: couleur diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index 303554804..065246ddd 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -213,31 +213,6 @@ ** type: couleur ** valeurs: un nom de couleur (valeur par défaut: blue) -* *weechat.color.nicklist_prefix1* -** description: couleur du texte pour le préfixe n°1 de la liste des pseudos -** type: couleur -** valeurs: un nom de couleur (valeur par défaut: lightgreen) - -* *weechat.color.nicklist_prefix2* -** description: couleur du texte pour le préfixe n°2 de la liste des pseudos -** type: couleur -** valeurs: un nom de couleur (valeur par défaut: lightmagenta) - -* *weechat.color.nicklist_prefix3* -** description: couleur du texte pour le préfixe n°3 de la liste des pseudos -** type: couleur -** valeurs: un nom de couleur (valeur par défaut: yellow) - -* *weechat.color.nicklist_prefix4* -** description: couleur du texte pour le préfixe n°4 de la liste des pseudos -** type: couleur -** valeurs: un nom de couleur (valeur par défaut: blue) - -* *weechat.color.nicklist_prefix5* -** description: couleur du texte pour le préfixe n°5 de la liste des pseudos -** type: couleur -** valeurs: un nom de couleur (valeur par défaut: brown) - * *weechat.color.separator* ** description: couleur du fond pour les séparateurs de fenêtres (quand divisé) ** type: couleur diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index 3977beb59..3d0fec157 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -23,6 +23,26 @@ ** tipo: colore ** valori: un nome colore (valore predefinito: red) +* *irc.color.nick_prefix_halfop* +** descrizione: color for prefix of nick which is halfop on channel +** tipo: colore +** valori: un nome colore (valore predefinito: lightmagenta) + +* *irc.color.nick_prefix_op* +** descrizione: color for prefix of nick which is op/admin/owner on channel +** tipo: colore +** valori: un nome colore (valore predefinito: lightgreen) + +* *irc.color.nick_prefix_user* +** descrizione: color for prefix of nick which is user on channel +** tipo: colore +** valori: un nome colore (valore predefinito: blue) + +* *irc.color.nick_prefix_voice* +** descrizione: color for prefix of nick which has voice on channel +** tipo: colore +** valori: un nome colore (valore predefinito: yellow) + * *irc.color.notice* ** descrizione: colore per il testo "Notifica" nelle notifiche ** tipo: colore diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index 8420104ff..c66698775 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -213,31 +213,6 @@ ** tipo: colore ** valori: un nome colore (valore predefinito: blue) -* *weechat.color.nicklist_prefix1* -** descrizione: colore del testo per il prefisso #1 nella nicklist -** tipo: colore -** valori: un nome colore (valore predefinito: lightgreen) - -* *weechat.color.nicklist_prefix2* -** descrizione: colore del testo per il prefisso #2 nella nicklist -** tipo: colore -** valori: un nome colore (valore predefinito: lightmagenta) - -* *weechat.color.nicklist_prefix3* -** descrizione: colore del testo per il prefisso #3 nella nicklist -** tipo: colore -** valori: un nome colore (valore predefinito: yellow) - -* *weechat.color.nicklist_prefix4* -** descrizione: colore del testo per il prefisso #4 nella nicklist -** tipo: colore -** valori: un nome colore (valore predefinito: blue) - -* *weechat.color.nicklist_prefix5* -** descrizione: colore del testo per il prefisso #5 nella nicklist -** tipo: colore -** valori: un nome colore (valore predefinito: brown) - * *weechat.color.separator* ** descrizione: colore di sfondo per i separatori delle finestre (quando divise) ** tipo: colore diff --git a/po/cs.po b/po/cs.po index 2b91f2c9c..9df4722f2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-01 15:22+0200\n" +"POT-Creation-Date: 2010-06-04 11:47+0200\n" "PO-Revision-Date: 2010-05-20 12:20+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -2039,21 +2039,6 @@ msgstr "barva textu pro nepřítomné přezdíveky" msgid "text color for offline nicknames" msgstr "barva textu pro nepřipojené přezdíveky" -msgid "text color for prefix #1 in nicklist" -msgstr "barva textu pro 1. prefix v seznamu přezdívek" - -msgid "text color for prefix #2 in nicklist" -msgstr "barva textu pro 2. prefix v seznamu přezdívek" - -msgid "text color for prefix #3 in nicklist" -msgstr "barva textu pro 3. prefix v seznamu přezdívek" - -msgid "text color for prefix #4 in nicklist" -msgstr "barva textu pro 4. prefix v seznamu přezdívek" - -msgid "text color for prefix #5 in nicklist" -msgstr "barva textu pro 5. prefix v seznamu přezdívek" - msgid "" "default completion template (please see documentation for template codes and " "values)" @@ -4533,6 +4518,18 @@ msgstr "barva textu vezprávách připojení" msgid "color for text in part/quit messages" msgstr "barva textu ve zprávách odchodu/ukončení" +msgid "color for prefix of nick which is op/admin/owner on channel" +msgstr "" + +msgid "color for prefix of nick which is halfop on channel" +msgstr "" + +msgid "color for prefix of nick which has voice on channel" +msgstr "" + +msgid "color for prefix of nick which is user on channel" +msgstr "" + msgid "color for text \"Notice\" in notices" msgstr "barva textu \"Notice\" v upozorněních" @@ -6555,6 +6552,21 @@ msgstr "Argumenty" msgid "Pointer" msgstr "Ukazatel" +#~ msgid "text color for prefix #1 in nicklist" +#~ msgstr "barva textu pro 1. prefix v seznamu přezdívek" + +#~ msgid "text color for prefix #2 in nicklist" +#~ msgstr "barva textu pro 2. prefix v seznamu přezdívek" + +#~ msgid "text color for prefix #3 in nicklist" +#~ msgstr "barva textu pro 3. prefix v seznamu přezdívek" + +#~ msgid "text color for prefix #4 in nicklist" +#~ msgstr "barva textu pro 4. prefix v seznamu přezdívek" + +#~ msgid "text color for prefix #5 in nicklist" +#~ msgstr "barva textu pro 5. prefix v seznamu přezdívek" + #~ msgid "" #~ "channel: channel name to join\n" #~ " key: key to join the channel" diff --git a/po/de.po b/po/de.po index 0c06fd35b..01ea90f89 100644 --- a/po/de.po +++ b/po/de.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-01 15:22+0200\n" +"POT-Creation-Date: 2010-06-04 11:47+0200\n" "PO-Revision-Date: 2010-05-24 10:01+0200\n" "Last-Translator: Nils G \n" "Language-Team: weechat-dev \n" @@ -2119,21 +2119,6 @@ msgstr "Textfarbe von abwesenden Nicknamen" msgid "text color for offline nicknames" msgstr "Textfarbe von Nicknamen die Offline sind" -msgid "text color for prefix #1 in nicklist" -msgstr "Textfarbe für Präfix #1 in Nickliste" - -msgid "text color for prefix #2 in nicklist" -msgstr "Textfarbe für Präfix #2 in Nickliste" - -msgid "text color for prefix #3 in nicklist" -msgstr "Textfarbe für Präfix #3 in Nickliste" - -msgid "text color for prefix #4 in nicklist" -msgstr "Textfarbe für Präfix #4 in Nickliste" - -msgid "text color for prefix #5 in nicklist" -msgstr "Textfarbe für Präfix #5 in Nickliste" - msgid "" "default completion template (please see documentation for template codes and " "values)" @@ -4718,6 +4703,18 @@ msgstr "" "Textfarbe in der die Meldungen für das Verlassen/Beenden eines Channels " "angezeigt werden soll" +msgid "color for prefix of nick which is op/admin/owner on channel" +msgstr "" + +msgid "color for prefix of nick which is halfop on channel" +msgstr "" + +msgid "color for prefix of nick which has voice on channel" +msgstr "" + +msgid "color for prefix of nick which is user on channel" +msgstr "" + msgid "color for text \"Notice\" in notices" msgstr "Farbe des \"Notice\"-Textes in Notizen" @@ -6799,3 +6796,18 @@ msgstr "Argumente" msgid "Pointer" msgstr "Pointer" + +#~ msgid "text color for prefix #1 in nicklist" +#~ msgstr "Textfarbe für Präfix #1 in Nickliste" + +#~ msgid "text color for prefix #2 in nicklist" +#~ msgstr "Textfarbe für Präfix #2 in Nickliste" + +#~ msgid "text color for prefix #3 in nicklist" +#~ msgstr "Textfarbe für Präfix #3 in Nickliste" + +#~ msgid "text color for prefix #4 in nicklist" +#~ msgstr "Textfarbe für Präfix #4 in Nickliste" + +#~ msgid "text color for prefix #5 in nicklist" +#~ msgstr "Textfarbe für Präfix #5 in Nickliste" diff --git a/po/es.po b/po/es.po index eb2316ef3..c2e034682 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-01 15:22+0200\n" +"POT-Creation-Date: 2010-06-04 11:47+0200\n" "PO-Revision-Date: 2010-05-20 12:31+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -2069,21 +2069,6 @@ msgstr "color para apodos ausentes" msgid "text color for offline nicknames" msgstr "color para apodos desconectados" -msgid "text color for prefix #1 in nicklist" -msgstr "color para el prefijo #1 en la lista de apodos" - -msgid "text color for prefix #2 in nicklist" -msgstr "color para el prefijo #2 en la lista de apodos" - -msgid "text color for prefix #3 in nicklist" -msgstr "color para el prefijo #3 en la lista de apodos" - -msgid "text color for prefix #4 in nicklist" -msgstr "color para el prefijo #4 en la lista de apodos" - -msgid "text color for prefix #5 in nicklist" -msgstr "color para el prefijo #5 en la lista de apodos" - msgid "" "default completion template (please see documentation for template codes and " "values)" @@ -4600,6 +4585,18 @@ msgstr "color para el texto en mensajes de unión" msgid "color for text in part/quit messages" msgstr "color para el texto en mensajes de salida/abandono" +msgid "color for prefix of nick which is op/admin/owner on channel" +msgstr "" + +msgid "color for prefix of nick which is halfop on channel" +msgstr "" + +msgid "color for prefix of nick which has voice on channel" +msgstr "" + +msgid "color for prefix of nick which is user on channel" +msgstr "" + msgid "color for text \"Notice\" in notices" msgstr "color para el texto \"Notice\" en los mensajes de aviso" @@ -6667,6 +6664,21 @@ msgstr "Argumentos" msgid "Pointer" msgstr "Puntero" +#~ msgid "text color for prefix #1 in nicklist" +#~ msgstr "color para el prefijo #1 en la lista de apodos" + +#~ msgid "text color for prefix #2 in nicklist" +#~ msgstr "color para el prefijo #2 en la lista de apodos" + +#~ msgid "text color for prefix #3 in nicklist" +#~ msgstr "color para el prefijo #3 en la lista de apodos" + +#~ msgid "text color for prefix #4 in nicklist" +#~ msgstr "color para el prefijo #4 en la lista de apodos" + +#~ msgid "text color for prefix #5 in nicklist" +#~ msgstr "color para el prefijo #5 en la lista de apodos" + #~ msgid "" #~ "channel: channel name to join\n" #~ " key: key to join the channel" diff --git a/po/fr.po b/po/fr.po index 2241c4657..293d77301 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-01 15:22+0200\n" -"PO-Revision-Date: 2010-06-01 15:23+0200\n" +"POT-Creation-Date: 2010-06-04 11:47+0200\n" +"PO-Revision-Date: 2010-06-04 11:47+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -2089,21 +2089,6 @@ msgstr "couleur du texte pour les pseudos absents" msgid "text color for offline nicknames" msgstr "couleur du texte pour les pseudos déconnectés" -msgid "text color for prefix #1 in nicklist" -msgstr "couleur du texte pour le préfixe n°1 de la liste des pseudos" - -msgid "text color for prefix #2 in nicklist" -msgstr "couleur du texte pour le préfixe n°2 de la liste des pseudos" - -msgid "text color for prefix #3 in nicklist" -msgstr "couleur du texte pour le préfixe n°3 de la liste des pseudos" - -msgid "text color for prefix #4 in nicklist" -msgstr "couleur du texte pour le préfixe n°4 de la liste des pseudos" - -msgid "text color for prefix #5 in nicklist" -msgstr "couleur du texte pour le préfixe n°5 de la liste des pseudos" - msgid "" "default completion template (please see documentation for template codes and " "values)" @@ -4643,6 +4628,19 @@ msgstr "couleur pour le texte dans les messages join" msgid "color for text in part/quit messages" msgstr "couleur pour le texte dans les messages part/quit" +msgid "color for prefix of nick which is op/admin/owner on channel" +msgstr "" +"couleur pour le préfixe d'un pseudo qui est op/admin/owner sur le canal" + +msgid "color for prefix of nick which is halfop on channel" +msgstr "couleur pour le préfixe d'un pseudo qui est halfop sur le canal" + +msgid "color for prefix of nick which has voice on channel" +msgstr "couleur pour le préfixe d'un pseudo qui a le voice sur le canal" + +msgid "color for prefix of nick which is user on channel" +msgstr "couleur pour le préfixe d'un pseudo qui est user sur le canal" + msgid "color for text \"Notice\" in notices" msgstr "couleur pour le texte \"Notice\" dans les notices" @@ -6703,6 +6701,21 @@ msgstr "Paramètres" msgid "Pointer" msgstr "Pointeur" +#~ msgid "text color for prefix #1 in nicklist" +#~ msgstr "couleur du texte pour le préfixe n°1 de la liste des pseudos" + +#~ msgid "text color for prefix #2 in nicklist" +#~ msgstr "couleur du texte pour le préfixe n°2 de la liste des pseudos" + +#~ msgid "text color for prefix #3 in nicklist" +#~ msgstr "couleur du texte pour le préfixe n°3 de la liste des pseudos" + +#~ msgid "text color for prefix #4 in nicklist" +#~ msgstr "couleur du texte pour le préfixe n°4 de la liste des pseudos" + +#~ msgid "text color for prefix #5 in nicklist" +#~ msgstr "couleur du texte pour le préfixe n°5 de la liste des pseudos" + #~ msgid "" #~ "channel: channel name to join\n" #~ " key: key to join the channel" diff --git a/po/hu.po b/po/hu.po index ca60daee8..9be35a31e 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-01 15:22+0200\n" +"POT-Creation-Date: 2010-06-04 11:47+0200\n" "PO-Revision-Date: 2010-05-20 12:20+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1890,26 +1890,6 @@ msgstr "távollevő felhasználók nevének színe" msgid "text color for offline nicknames" msgstr "távollevő felhasználók nevének színe" -#, fuzzy -msgid "text color for prefix #1 in nicklist" -msgstr "név színe" - -#, fuzzy -msgid "text color for prefix #2 in nicklist" -msgstr "név színe" - -#, fuzzy -msgid "text color for prefix #3 in nicklist" -msgstr "név színe" - -#, fuzzy -msgid "text color for prefix #4 in nicklist" -msgstr "név színe" - -#, fuzzy -msgid "text color for prefix #5 in nicklist" -msgstr "név színe" - msgid "" "default completion template (please see documentation for template codes and " "values)" @@ -4345,6 +4325,18 @@ msgstr "új üzenetet tartalmazó ablak színe" msgid "color for text in part/quit messages" msgstr "alapértelmezett kilépő üzenet" +msgid "color for prefix of nick which is op/admin/owner on channel" +msgstr "" + +msgid "color for prefix of nick which is halfop on channel" +msgstr "" + +msgid "color for prefix of nick which has voice on channel" +msgstr "" + +msgid "color for prefix of nick which is user on channel" +msgstr "" + #, fuzzy msgid "color for text \"Notice\" in notices" msgstr "új üzenetet tartalmazó ablak színe" @@ -6354,6 +6346,26 @@ msgstr "fogadó típusa [paraméterek]" msgid "Pointer" msgstr "perc" +#, fuzzy +#~ msgid "text color for prefix #1 in nicklist" +#~ msgstr "név színe" + +#, fuzzy +#~ msgid "text color for prefix #2 in nicklist" +#~ msgstr "név színe" + +#, fuzzy +#~ msgid "text color for prefix #3 in nicklist" +#~ msgstr "név színe" + +#, fuzzy +#~ msgid "text color for prefix #4 in nicklist" +#~ msgstr "név színe" + +#, fuzzy +#~ msgid "text color for prefix #5 in nicklist" +#~ msgstr "név színe" + #~ msgid "" #~ "channel: channel name to join\n" #~ " key: key to join the channel" diff --git a/po/it.po b/po/it.po index cf90bfdf4..722cc1bd2 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Weechat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-01 15:22+0200\n" +"POT-Creation-Date: 2010-06-04 11:47+0200\n" "PO-Revision-Date: 2010-05-24 10:01+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -2066,21 +2066,6 @@ msgstr "colore del testo per i nick assenti" msgid "text color for offline nicknames" msgstr "colore del testo per i nick non in linea" -msgid "text color for prefix #1 in nicklist" -msgstr "colore del testo per il prefisso #1 nella nicklist" - -msgid "text color for prefix #2 in nicklist" -msgstr "colore del testo per il prefisso #2 nella nicklist" - -msgid "text color for prefix #3 in nicklist" -msgstr "colore del testo per il prefisso #3 nella nicklist" - -msgid "text color for prefix #4 in nicklist" -msgstr "colore del testo per il prefisso #4 nella nicklist" - -msgid "text color for prefix #5 in nicklist" -msgstr "colore del testo per il prefisso #5 nella nicklist" - msgid "" "default completion template (please see documentation for template codes and " "values)" @@ -4611,6 +4596,18 @@ msgstr "colore per il testo nei messaggi di entrata" msgid "color for text in part/quit messages" msgstr "colore per il testo nei messaggi di uscita/abbandono" +msgid "color for prefix of nick which is op/admin/owner on channel" +msgstr "" + +msgid "color for prefix of nick which is halfop on channel" +msgstr "" + +msgid "color for prefix of nick which has voice on channel" +msgstr "" + +msgid "color for prefix of nick which is user on channel" +msgstr "" + msgid "color for text \"Notice\" in notices" msgstr "colore per il testo \"Notifica\" nelle notifiche" @@ -6651,3 +6648,18 @@ msgstr "Argomenti" msgid "Pointer" msgstr "Puntatore" + +#~ msgid "text color for prefix #1 in nicklist" +#~ msgstr "colore del testo per il prefisso #1 nella nicklist" + +#~ msgid "text color for prefix #2 in nicklist" +#~ msgstr "colore del testo per il prefisso #2 nella nicklist" + +#~ msgid "text color for prefix #3 in nicklist" +#~ msgstr "colore del testo per il prefisso #3 nella nicklist" + +#~ msgid "text color for prefix #4 in nicklist" +#~ msgstr "colore del testo per il prefisso #4 nella nicklist" + +#~ msgid "text color for prefix #5 in nicklist" +#~ msgstr "colore del testo per il prefisso #5 nella nicklist" diff --git a/po/pl.po b/po/pl.po index 725f8cefe..c3e13aee9 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-01 15:22+0200\n" +"POT-Creation-Date: 2010-06-04 11:47+0200\n" "PO-Revision-Date: 2010-05-20 12:22+0200\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" @@ -2070,21 +2070,6 @@ msgstr "kolor nicków ze statusem nieobecności" msgid "text color for offline nicknames" msgstr "kolor dla nieobecnych nicków" -msgid "text color for prefix #1 in nicklist" -msgstr "kolor przedrostka #1 na liście nicków" - -msgid "text color for prefix #2 in nicklist" -msgstr "kolor przedrostka #2 na liście nicków" - -msgid "text color for prefix #3 in nicklist" -msgstr "kolor przedrostka #3 na liście nicków" - -msgid "text color for prefix #4 in nicklist" -msgstr "kolor przedrostka #4 na liście nicków" - -msgid "text color for prefix #5 in nicklist" -msgstr "kolor przedrostka #5 na liście nicków" - msgid "" "default completion template (please see documentation for template codes and " "values)" @@ -4578,6 +4563,18 @@ msgstr "kolor tekstu w wiadomościach o wejsciu na kanał" msgid "color for text in part/quit messages" msgstr "kolor tekstu w wiadomościach o opuszczeniu kanału/wyjściu z IRC" +msgid "color for prefix of nick which is op/admin/owner on channel" +msgstr "" + +msgid "color for prefix of nick which is halfop on channel" +msgstr "" + +msgid "color for prefix of nick which has voice on channel" +msgstr "" + +msgid "color for prefix of nick which is user on channel" +msgstr "" + msgid "color for text \"Notice\" in notices" msgstr "kolor tekstu \"Notice\" w podświetleniach" @@ -6600,6 +6597,21 @@ msgstr "Argumenty" msgid "Pointer" msgstr "Wskaźnik" +#~ msgid "text color for prefix #1 in nicklist" +#~ msgstr "kolor przedrostka #1 na liście nicków" + +#~ msgid "text color for prefix #2 in nicklist" +#~ msgstr "kolor przedrostka #2 na liście nicków" + +#~ msgid "text color for prefix #3 in nicklist" +#~ msgstr "kolor przedrostka #3 na liście nicków" + +#~ msgid "text color for prefix #4 in nicklist" +#~ msgstr "kolor przedrostka #4 na liście nicków" + +#~ msgid "text color for prefix #5 in nicklist" +#~ msgstr "kolor przedrostka #5 na liście nicków" + #~ msgid "" #~ "channel: channel name to join\n" #~ " key: key to join the channel" diff --git a/po/ru.po b/po/ru.po index 24a25cbc6..ee80f42cb 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.3-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2010-06-01 15:22+0200\n" +"POT-Creation-Date: 2010-06-04 11:47+0200\n" "PO-Revision-Date: 2010-05-20 12:22+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1899,26 +1899,6 @@ msgstr "цвет отошедших ников" msgid "text color for offline nicknames" msgstr "цвет отошедших ников" -#, fuzzy -msgid "text color for prefix #1 in nicklist" -msgstr "цвет ника" - -#, fuzzy -msgid "text color for prefix #2 in nicklist" -msgstr "цвет ника" - -#, fuzzy -msgid "text color for prefix #3 in nicklist" -msgstr "цвет ника" - -#, fuzzy -msgid "text color for prefix #4 in nicklist" -msgstr "цвет ника" - -#, fuzzy -msgid "text color for prefix #5 in nicklist" -msgstr "цвет ника" - msgid "" "default completion template (please see documentation for template codes and " "values)" @@ -4345,6 +4325,18 @@ msgstr "цвет текущего окна с сообщениями" msgid "color for text in part/quit messages" msgstr "сообщение о выходе по-умолчанию" +msgid "color for prefix of nick which is op/admin/owner on channel" +msgstr "" + +msgid "color for prefix of nick which is halfop on channel" +msgstr "" + +msgid "color for prefix of nick which has voice on channel" +msgstr "" + +msgid "color for prefix of nick which is user on channel" +msgstr "" + #, fuzzy msgid "color for text \"Notice\" in notices" msgstr "цвет текущего окна с сообщениями" @@ -6351,6 +6343,26 @@ msgstr "адресат тип [аргументы]" msgid "Pointer" msgstr "минута" +#, fuzzy +#~ msgid "text color for prefix #1 in nicklist" +#~ msgstr "цвет ника" + +#, fuzzy +#~ msgid "text color for prefix #2 in nicklist" +#~ msgstr "цвет ника" + +#, fuzzy +#~ msgid "text color for prefix #3 in nicklist" +#~ msgstr "цвет ника" + +#, fuzzy +#~ msgid "text color for prefix #4 in nicklist" +#~ msgstr "цвет ника" + +#, fuzzy +#~ msgid "text color for prefix #5 in nicklist" +#~ msgstr "цвет ника" + #~ msgid "" #~ "channel: channel name to join\n" #~ " key: key to join the channel" diff --git a/po/weechat.pot b/po/weechat.pot index 925fcc858..311402422 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: 2010-06-01 15:22+0200\n" +"POT-Creation-Date: 2010-06-04 11:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1612,21 +1612,6 @@ msgstr "" msgid "text color for offline nicknames" msgstr "" -msgid "text color for prefix #1 in nicklist" -msgstr "" - -msgid "text color for prefix #2 in nicklist" -msgstr "" - -msgid "text color for prefix #3 in nicklist" -msgstr "" - -msgid "text color for prefix #4 in nicklist" -msgstr "" - -msgid "text color for prefix #5 in nicklist" -msgstr "" - msgid "" "default completion template (please see documentation for template codes and " "values)" @@ -3720,6 +3705,18 @@ msgstr "" msgid "color for text in part/quit messages" msgstr "" +msgid "color for prefix of nick which is op/admin/owner on channel" +msgstr "" + +msgid "color for prefix of nick which is halfop on channel" +msgstr "" + +msgid "color for prefix of nick which has voice on channel" +msgstr "" + +msgid "color for prefix of nick which is user on channel" +msgstr "" + msgid "color for text \"Notice\" in notices" msgstr "" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 9170700e1..7f8f5f111 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -155,11 +155,6 @@ struct t_config_option *config_color_input_actions; struct t_config_option *config_color_nicklist_group; struct t_config_option *config_color_nicklist_away; struct t_config_option *config_color_nicklist_offline; -struct t_config_option *config_color_nicklist_prefix1; -struct t_config_option *config_color_nicklist_prefix2; -struct t_config_option *config_color_nicklist_prefix3; -struct t_config_option *config_color_nicklist_prefix4; -struct t_config_option *config_color_nicklist_prefix5; /* config, completion section */ @@ -1836,36 +1831,6 @@ config_weechat_init_options () N_("text color for offline nicknames"), NULL, -1, 0, "blue", NULL, 0, NULL, NULL, &config_change_color, NULL, NULL, NULL); - config_color_nicklist_prefix1 = config_file_new_option ( - weechat_config_file, ptr_section, - "nicklist_prefix1", "color", - N_("text color for prefix #1 in nicklist"), - NULL, -1, 0, "lightgreen", NULL, 0, - NULL, NULL, &config_change_color, NULL, NULL, NULL); - config_color_nicklist_prefix2 = config_file_new_option ( - weechat_config_file, ptr_section, - "nicklist_prefix2", "color", - N_("text color for prefix #2 in nicklist"), - NULL, -1, 0, "lightmagenta", NULL, 0, - NULL, NULL, &config_change_color, NULL, NULL, NULL); - config_color_nicklist_prefix3 = config_file_new_option ( - weechat_config_file, ptr_section, - "nicklist_prefix3", "color", - N_("text color for prefix #3 in nicklist"), - NULL, -1, 0, "yellow", NULL, 0, - NULL, NULL, &config_change_color, NULL, NULL, NULL); - config_color_nicklist_prefix4 = config_file_new_option ( - weechat_config_file, ptr_section, - "nicklist_prefix4", "color", - N_("text color for prefix #4 in nicklist"), - NULL, -1, 0, "blue", NULL, 0, - NULL, NULL, &config_change_color, NULL, NULL, NULL); - config_color_nicklist_prefix5 = config_file_new_option ( - weechat_config_file, ptr_section, - "nicklist_prefix5", "color", - N_("text color for prefix #5 in nicklist"), - NULL, -1, 0, "brown", NULL, 0, - NULL, NULL, &config_change_color, NULL, NULL, NULL); /* completion */ ptr_section = config_file_new_section (weechat_config_file, "completion", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index f034f1b78..d8b82d91e 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -166,11 +166,6 @@ extern struct t_config_option *config_color_input_actions; extern struct t_config_option *config_color_nicklist_group; extern struct t_config_option *config_color_nicklist_away; extern struct t_config_option *config_color_nicklist_offline; -extern struct t_config_option *config_color_nicklist_prefix1; -extern struct t_config_option *config_color_nicklist_prefix2; -extern struct t_config_option *config_color_nicklist_prefix3; -extern struct t_config_option *config_color_nicklist_prefix4; -extern struct t_config_option *config_color_nicklist_prefix5; extern struct t_config_option *config_completion_default_template; extern struct t_config_option *config_completion_nick_add_space; diff --git a/src/plugins/irc/irc-bar-item.c b/src/plugins/irc/irc-bar-item.c index c34723478..5f0dceb7e 100644 --- a/src/plugins/irc/irc-bar-item.c +++ b/src/plugins/irc/irc-bar-item.c @@ -405,7 +405,7 @@ irc_bar_item_input_prompt (void *data, struct t_gui_bar_item *item, struct t_irc_server *server; struct t_irc_channel *channel; struct t_irc_nick *ptr_nick; - char *buf, prefix[2], str_prefix_color[64], str_prefix[64]; + char *buf, prefix[2], str_prefix[64]; int length, prefix_color; /* make C compiler happy */ @@ -438,11 +438,8 @@ irc_bar_item_input_prompt (void *data, struct t_gui_bar_item *item, &prefix[0], &prefix_color, NULL, NULL); if (prefix[0] != ' ') { - snprintf (str_prefix_color, sizeof (str_prefix_color), - "weechat.color.nicklist_prefix%d", - prefix_color); snprintf (str_prefix, sizeof (str_prefix), "%s%s", - weechat_color(weechat_config_string(weechat_config_get(str_prefix_color))), + weechat_color (weechat_config_string (weechat_config_get (irc_nick_get_prefix_color_name (prefix_color)))), prefix); } } diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h index 0529c0681..be9b1dd29 100644 --- a/src/plugins/irc/irc-color.h +++ b/src/plugins/irc/irc-color.h @@ -66,11 +66,10 @@ #define IRC_COLOR_CHAT_NICK_OTHER weechat_color("chat_nick_other") #define IRC_COLOR_CHAT_SERVER weechat_color("chat_server") #define IRC_COLOR_CHAT_VALUE weechat_color("chat_value") -#define IRC_COLOR_NICKLIST_PREFIX1 weechat_color("nicklist_prefix1") -#define IRC_COLOR_NICKLIST_PREFIX2 weechat_color("nicklist_prefix2") -#define IRC_COLOR_NICKLIST_PREFIX3 weechat_color("nicklist_prefix3") -#define IRC_COLOR_NICKLIST_PREFIX4 weechat_color("nicklist_prefix4") -#define IRC_COLOR_NICKLIST_PREFIX5 weechat_color("nicklist_prefix5") +#define IRC_COLOR_NICK_PREFIX_OP weechat_color(weechat_config_string(irc_config_color_nick_prefix_op)) +#define IRC_COLOR_NICK_PREFIX_HALFOP weechat_color(weechat_config_string(irc_config_color_nick_prefix_halfop)) +#define IRC_COLOR_NICK_PREFIX_VOICE weechat_color(weechat_config_string(irc_config_color_nick_prefix_voice)) +#define IRC_COLOR_NICK_PREFIX_USER weechat_color(weechat_config_string(irc_config_color_nick_prefix_user)) #define IRC_COLOR_BAR_FG weechat_color("bar_fg") #define IRC_COLOR_BAR_BG weechat_color("bar_bg") #define IRC_COLOR_BAR_DELIM weechat_color("bar_delim") diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 0fe794e92..1a9bf3f71 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -85,6 +85,10 @@ struct t_config_option *irc_config_look_topic_strip_colors; struct t_config_option *irc_config_color_message_join; struct t_config_option *irc_config_color_message_quit; +struct t_config_option *irc_config_color_nick_prefix_op; +struct t_config_option *irc_config_color_nick_prefix_halfop; +struct t_config_option *irc_config_color_nick_prefix_voice; +struct t_config_option *irc_config_color_nick_prefix_user; struct t_config_option *irc_config_color_notice; struct t_config_option *irc_config_color_input_nick; struct t_config_option *irc_config_color_item_away; @@ -408,6 +412,23 @@ irc_config_change_color_item_buffer_name (void *data, weechat_bar_item_update ("buffer_name"); } +/* + * irc_config_change_color_nick_prefix: called when the color of a nick prefix + * is changed + */ + +void +irc_config_change_color_nick_prefix (void *data, + struct t_config_option *option) +{ + /* make C compiler happy */ + (void) data; + (void) option; + + weechat_bar_item_update ("input_prompt"); + weechat_bar_item_update ("nicklist"); +} + /* * irc_config_change_network_away_check: called when away check is changed */ @@ -1647,6 +1668,30 @@ irc_config_init () N_("color for text in part/quit messages"), NULL, -1, 0, "red", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_color_nick_prefix_op = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_prefix_op", "color", + N_("color for prefix of nick which is op/admin/owner on channel"), + NULL, -1, 0, "lightgreen", NULL, 0, NULL, NULL, + &irc_config_change_color_nick_prefix, NULL, NULL, NULL); + irc_config_color_nick_prefix_halfop = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_prefix_halfop", "color", + N_("color for prefix of nick which is halfop on channel"), + NULL, -1, 0, "lightmagenta", NULL, 0, NULL, NULL, + &irc_config_change_color_nick_prefix, NULL, NULL, NULL); + irc_config_color_nick_prefix_voice = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_prefix_voice", "color", + N_("color for prefix of nick which has voice on channel"), + NULL, -1, 0, "yellow", NULL, 0, NULL, NULL, + &irc_config_change_color_nick_prefix, NULL, NULL, NULL); + irc_config_color_nick_prefix_user = weechat_config_new_option ( + irc_config_file, ptr_section, + "nick_prefix_user", "color", + N_("color for prefix of nick which is user on channel"), + NULL, -1, 0, "blue", NULL, 0, NULL, NULL, + &irc_config_change_color_nick_prefix, NULL, NULL, NULL); irc_config_color_notice = weechat_config_new_option ( irc_config_file, ptr_section, "notice", "color", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index aa1cd619b..55a98d4cc 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -102,6 +102,10 @@ extern struct t_config_option *irc_config_look_topic_strip_colors; extern struct t_config_option *irc_config_color_message_join; extern struct t_config_option *irc_config_color_message_quit; +extern struct t_config_option *irc_config_color_nick_prefix_op; +extern struct t_config_option *irc_config_color_nick_prefix_halfop; +extern struct t_config_option *irc_config_color_nick_prefix_voice; +extern struct t_config_option *irc_config_color_nick_prefix_user; extern struct t_config_option *irc_config_color_notice; extern struct t_config_option *irc_config_color_input_nick; extern struct t_config_option *irc_config_color_item_away; diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c index c0c4975c6..5c474440a 100644 --- a/src/plugins/irc/irc-nick.c +++ b/src/plugins/irc/irc-nick.c @@ -210,6 +210,28 @@ irc_nick_get_gui_infos (struct t_irc_server *server, } } +/* + * irc_nick_get_prefix_color_name: return name of color with a prefix number + */ + +const char * +irc_nick_get_prefix_color_name (int prefix_color) +{ + static char *color_for_prefix[] = { + "chat", + "irc.color.nick_prefix_op", + "irc.color.nick_prefix_halfop", + "irc.color.nick_prefix_voice", + "irc.color.nick_prefix_user", + }; + + if ((prefix_color >= 0) && (prefix_color <= 4)) + return color_for_prefix[prefix_color]; + + /* no color by default (should not happen) */ + return color_for_prefix[0]; +} + /* * irc_nick_new: allocate a new nick for a channel and add it to the nick list */ @@ -221,7 +243,7 @@ irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel, int is_chanuser, int is_away) { struct t_irc_nick *new_nick, *ptr_nick; - char prefix[2], str_prefix_color[64]; + char prefix[2]; int prefix_color; struct t_gui_nick_group *ptr_group; @@ -252,14 +274,13 @@ irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel, prefix[1] = '\0'; irc_nick_get_gui_infos (server, ptr_nick, prefix, &prefix_color, channel->buffer, &ptr_group); - snprintf (str_prefix_color, sizeof (str_prefix_color), - "weechat.color.nicklist_prefix%d", - prefix_color); weechat_nicklist_add_nick (channel->buffer, ptr_group, ptr_nick->name, (is_away) ? "weechat.color.nicklist_away" : "bar_fg", - prefix, str_prefix_color, 1); + prefix, + irc_nick_get_prefix_color_name (prefix_color), + 1); return ptr_nick; } @@ -303,14 +324,13 @@ irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel, prefix[1] = '\0'; irc_nick_get_gui_infos (server, new_nick, prefix, &prefix_color, channel->buffer, &ptr_group); - snprintf (str_prefix_color, sizeof (str_prefix_color), - "weechat.color.nicklist_prefix%d", - prefix_color); weechat_nicklist_add_nick (channel->buffer, ptr_group, new_nick->name, (is_away) ? "weechat.color.nicklist_away" : "bar_fg", - prefix, str_prefix_color, 1); + prefix, + irc_nick_get_prefix_color_name (prefix_color), + 1); /* all is ok, return address of new nick */ return new_nick; @@ -326,7 +346,7 @@ irc_nick_change (struct t_irc_server *server, struct t_irc_channel *channel, { int nick_is_me, prefix_color; struct t_gui_nick_group *ptr_group; - char prefix[2], str_prefix_color[64]; + char prefix[2]; /* remove nick from nicklist */ irc_nick_get_gui_infos (server, nick, prefix, &prefix_color, @@ -355,14 +375,13 @@ irc_nick_change (struct t_irc_server *server, struct t_irc_channel *channel, prefix[1] = '\0'; irc_nick_get_gui_infos (server, nick, prefix, &prefix_color, channel->buffer, &ptr_group); - snprintf (str_prefix_color, sizeof (str_prefix_color), - "weechat.color.nicklist_prefix%d", - prefix_color); weechat_nicklist_add_nick (channel->buffer, ptr_group, nick->name, (nick->flags & IRC_NICK_AWAY) ? "weechat.color.nicklist_away" : "bar_fg", - prefix, str_prefix_color, 1); + prefix, + irc_nick_get_prefix_color_name (prefix_color), + 1); } /* @@ -373,7 +392,7 @@ void irc_nick_set (struct t_irc_server *server, struct t_irc_channel *channel, struct t_irc_nick *nick, int set, int flag) { - char prefix[2], str_prefix_color[64]; + char prefix[2]; int prefix_color; struct t_gui_nick_group *ptr_group; @@ -393,14 +412,13 @@ irc_nick_set (struct t_irc_server *server, struct t_irc_channel *channel, prefix[1] = '\0'; irc_nick_get_gui_infos (server, nick, prefix, &prefix_color, channel->buffer, &ptr_group); - snprintf (str_prefix_color, sizeof (str_prefix_color), - "weechat.color.nicklist_prefix%d", - prefix_color); weechat_nicklist_add_nick (channel->buffer, ptr_group, nick->name, (nick->flags & IRC_NICK_AWAY) ? "weechat.color.nicklist_away" : "bar_fg", - prefix, str_prefix_color, 1); + prefix, + irc_nick_get_prefix_color_name (prefix_color), + 1); if (strcmp (nick->name, server->nick) == 0) weechat_bar_item_update ("input_prompt"); @@ -567,7 +585,8 @@ irc_nick_as_prefix (struct t_irc_server *server, struct t_irc_nick *nick, const char *nickname, const char *force_color) { static char result[256]; - char prefix[2], str_prefix_color[64]; + char prefix[2]; + const char *str_prefix_color; int prefix_color; prefix[0] = '\0'; @@ -581,22 +600,19 @@ irc_nick_as_prefix (struct t_irc_server *server, struct t_irc_nick *nick, if ((prefix[0] == ' ') && !weechat_config_boolean (weechat_config_get ("weechat.look.nickmode_empty"))) prefix[0] = '\0'; - snprintf (str_prefix_color, sizeof (str_prefix_color), - "weechat.color.nicklist_prefix%d", - prefix_color); + str_prefix_color = weechat_color (weechat_config_string (weechat_config_get (irc_nick_get_prefix_color_name (prefix_color)))); } else { prefix[0] = (weechat_config_boolean (weechat_config_get ("weechat.look.nickmode_empty"))) ? ' ' : '\0'; - snprintf (str_prefix_color, sizeof (str_prefix_color), - "weechat.color.chat"); + str_prefix_color = IRC_COLOR_CHAT; } } else { prefix[0] = '\0'; - snprintf (str_prefix_color, sizeof (str_prefix_color), "chat"); + str_prefix_color = IRC_COLOR_CHAT; } snprintf (result, sizeof (result), "%s%s%s%s%s%s%s%s\t", @@ -606,7 +622,7 @@ irc_nick_as_prefix (struct t_irc_server *server, struct t_irc_nick *nick, (weechat_config_string (irc_config_look_nick_prefix) && weechat_config_string (irc_config_look_nick_prefix)[0]) ? weechat_config_string (irc_config_look_nick_prefix) : "", - weechat_color(weechat_config_string(weechat_config_get(str_prefix_color))), + str_prefix_color, prefix, (force_color) ? force_color : ((nick) ? nick->color : IRC_COLOR_CHAT_NICK), (nick) ? nick->name : nickname, diff --git a/src/plugins/irc/irc-nick.h b/src/plugins/irc/irc-nick.h index 093591094..12773dd19 100644 --- a/src/plugins/irc/irc-nick.h +++ b/src/plugins/irc/irc-nick.h @@ -75,6 +75,7 @@ extern void irc_nick_get_gui_infos (struct t_irc_server *server, char *prefix, int *prefix_color, struct t_gui_buffer *buffer, struct t_gui_nick_group **group); +extern const char *irc_nick_get_prefix_color_name (int prefix_color); extern struct t_irc_nick *irc_nick_new (struct t_irc_server *server, struct t_irc_channel *channel, const char *nickname, diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 45d0893f2..d9f825aea 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -3406,35 +3406,35 @@ IRC_PROTOCOL_CALLBACK(353) { case '@': /* op */ is_op = 1; - color = IRC_COLOR_NICKLIST_PREFIX1; + color = IRC_COLOR_NICK_PREFIX_OP; break; case '~': /* channel owner */ is_chanowner = 1; - color = IRC_COLOR_NICKLIST_PREFIX1; + color = IRC_COLOR_NICK_PREFIX_OP; break; case '*': /* channel owner */ is_chanowner = 1; - color = IRC_COLOR_NICKLIST_PREFIX1; + color = IRC_COLOR_NICK_PREFIX_OP; break; case '&': /* channel admin */ is_chanadmin = 1; - color = IRC_COLOR_NICKLIST_PREFIX1; + color = IRC_COLOR_NICK_PREFIX_OP; break; case '!': /* channel admin (2) */ is_chanadmin2 = 1; - color = IRC_COLOR_NICKLIST_PREFIX1; + color = IRC_COLOR_NICK_PREFIX_OP; break; case '%': /* half-op */ is_halfop = 1; - color = IRC_COLOR_NICKLIST_PREFIX2; + color = IRC_COLOR_NICK_PREFIX_HALFOP; break; case '+': /* voice */ has_voice = 1; - color = IRC_COLOR_NICKLIST_PREFIX3; + color = IRC_COLOR_NICK_PREFIX_VOICE; break; case '-': /* channel user */ is_chanuser = 1; - color = IRC_COLOR_NICKLIST_PREFIX4; + color = IRC_COLOR_NICK_PREFIX_USER; break; default: color = IRC_COLOR_CHAT;