summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog3
-rw-r--r--doc/de/autogen/user/irc_options.txt10
-rw-r--r--doc/en/autogen/user/irc_options.txt10
-rw-r--r--doc/fr/autogen/user/irc_options.txt10
-rw-r--r--doc/it/autogen/user/irc_options.txt10
-rw-r--r--po/cs.po8
-rw-r--r--po/de.po8
-rw-r--r--po/es.po8
-rw-r--r--po/fr.po14
-rw-r--r--po/hu.po8
-rw-r--r--po/it.po8
-rw-r--r--po/pl.po8
-rw-r--r--po/ru.po8
-rw-r--r--po/weechat.pot8
-rw-r--r--src/plugins/irc/irc-color.h2
-rw-r--r--src/plugins/irc/irc-config.c16
-rw-r--r--src/plugins/irc/irc-config.h2
-rw-r--r--src/plugins/irc/irc-nick.c4
18 files changed, 132 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 4d9b648a3..e500a0734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
-v0.3.4-dev, 2010-10-12
+v0.3.4-dev, 2010-10-13
Version 0.3.4 (under dev!)
@@ -22,6 +22,7 @@ Version 0.3.4 (under dev!)
* api: add priority for hooks (task #10550)
* api: add new functions: hashtable_get_string, hook_info_hashtable,
info_get_hashtable
+* irc: add new options irc.color.nick_prefix and irc.color.nick_suffix
* irc: add new option irc.look.item_away_message
* irc: add tag "nick_xxx" in user messages
* irc: move options from network section to server section: connection_timeout,
diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt
index bb9471bd9..ae09698aa 100644
--- a/doc/de/autogen/user/irc_options.txt
+++ b/doc/de/autogen/user/irc_options.txt
@@ -33,6 +33,11 @@
** Typ: Farbe
** Werte: ein Farbname (Standardwert: `red`)
+* *irc.color.nick_prefix*
+** Beschreibung: `color for nick prefix (prefix is custom string displayed before nick)`
+** Typ: Farbe
+** Werte: ein Farbname (Standardwert: `green`)
+
* *irc.color.nick_prefix_halfop*
** Beschreibung: `Textfarbe für den Nick-Präfix des halfop in einem Channel`
** Typ: Farbe
@@ -53,6 +58,11 @@
** Typ: Farbe
** Werte: ein Farbname (Standardwert: `yellow`)
+* *irc.color.nick_suffix*
+** Beschreibung: `color for nick suffix (suffix is custom string displayed after nick)`
+** Typ: Farbe
+** Werte: ein Farbname (Standardwert: `green`)
+
* *irc.color.notice*
** Beschreibung: `Farbe des "Notice"-Textes in Notizen`
** Typ: Farbe
diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt
index f52b76aa1..2f9be501d 100644
--- a/doc/en/autogen/user/irc_options.txt
+++ b/doc/en/autogen/user/irc_options.txt
@@ -33,6 +33,11 @@
** type: color
** values: a color name (default value: `red`)
+* *irc.color.nick_prefix*
+** description: `color for nick prefix (prefix is custom string displayed before nick)`
+** type: color
+** values: a color name (default value: `green`)
+
* *irc.color.nick_prefix_halfop*
** description: `color for prefix of nick which is halfop on channel`
** type: color
@@ -53,6 +58,11 @@
** type: color
** values: a color name (default value: `yellow`)
+* *irc.color.nick_suffix*
+** description: `color for nick suffix (suffix is custom string displayed after nick)`
+** type: color
+** values: a color name (default value: `green`)
+
* *irc.color.notice*
** description: `color for text "Notice" in notices`
** type: color
diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt
index 3d8c4c186..f11270de6 100644
--- a/doc/fr/autogen/user/irc_options.txt
+++ b/doc/fr/autogen/user/irc_options.txt
@@ -33,6 +33,11 @@
** type: couleur
** valeurs: un nom de couleur (valeur par défaut: `red`)
+* *irc.color.nick_prefix*
+** description: `couleur pour le préfixe du pseudo (le préfixe est une chaîne personnalisée affichée avant le pseudo)`
+** type: couleur
+** valeurs: un nom de couleur (valeur par défaut: `green`)
+
* *irc.color.nick_prefix_halfop*
** description: `couleur pour le préfixe d'un pseudo qui est halfop sur le canal`
** type: couleur
@@ -53,6 +58,11 @@
** type: couleur
** valeurs: un nom de couleur (valeur par défaut: `yellow`)
+* *irc.color.nick_suffix*
+** description: `couleur pour le suffixe du pseudo (le suffixe est une chaîne personnalisée affichée après le pseudo)`
+** type: couleur
+** valeurs: un nom de couleur (valeur par défaut: `green`)
+
* *irc.color.notice*
** description: `couleur pour le texte "Notice" dans les notices`
** type: couleur
diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt
index d7926b1df..ffb18a0ab 100644
--- a/doc/it/autogen/user/irc_options.txt
+++ b/doc/it/autogen/user/irc_options.txt
@@ -33,6 +33,11 @@
** tipo: colore
** valori: un nome colore (valore predefinito: `red`)
+* *irc.color.nick_prefix*
+** descrizione: `color for nick prefix (prefix is custom string displayed before nick)`
+** tipo: colore
+** valori: un nome colore (valore predefinito: `green`)
+
* *irc.color.nick_prefix_halfop*
** descrizione: `colore per il prefisso del nick che è halfop sul canale`
** tipo: colore
@@ -53,6 +58,11 @@
** tipo: colore
** valori: un nome colore (valore predefinito: `yellow`)
+* *irc.color.nick_suffix*
+** descrizione: `color for nick suffix (suffix is custom string displayed after nick)`
+** tipo: colore
+** valori: un nome colore (valore predefinito: `green`)
+
* *irc.color.notice*
** descrizione: `colore per il testo "Notifica" nelle notifiche`
** tipo: colore
diff --git a/po/cs.po b/po/cs.po
index 4812327e3..4327c9803 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-12 12:58+0200\n"
+"POT-Creation-Date: 2010-10-13 08:38+0200\n"
"PO-Revision-Date: 2010-08-07 10:46+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4702,6 +4702,12 @@ msgstr "barva prefixu přezdívky, která může mluvit na kanálu"
msgid "color for prefix of nick which is user on channel"
msgstr "barva prefixu přezdívky, která je uživatelem na kanálu"
+msgid "color for nick prefix (prefix is custom string displayed before nick)"
+msgstr ""
+
+msgid "color for nick suffix (suffix is custom string displayed after nick)"
+msgstr ""
+
msgid "color for text \"Notice\" in notices"
msgstr "barva textu \"Notice\" v upozorněních"
diff --git a/po/de.po b/po/de.po
index 1f2d539fa..350a5f6ab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-12 12:58+0200\n"
+"POT-Creation-Date: 2010-10-13 08:38+0200\n"
"PO-Revision-Date: 2010-10-11 16:32+0200\n"
"Last-Translator: Nils G.\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4898,6 +4898,12 @@ msgstr ""
msgid "color for prefix of nick which is user on channel"
msgstr "Textfarbe für den Nick-Präfix eines Users in einem Channel"
+msgid "color for nick prefix (prefix is custom string displayed before nick)"
+msgstr ""
+
+msgid "color for nick suffix (suffix is custom string displayed after nick)"
+msgstr ""
+
msgid "color for text \"Notice\" in notices"
msgstr "Farbe des \"Notice\"-Textes in Notizen"
diff --git a/po/es.po b/po/es.po
index 3bb089b55..f11822749 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-12 12:58+0200\n"
+"POT-Creation-Date: 2010-10-13 08:38+0200\n"
"PO-Revision-Date: 2010-08-07 10:46+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4761,6 +4761,12 @@ msgstr "color del prefijo del apodo cuando tiene voz en el canal"
msgid "color for prefix of nick which is user on channel"
msgstr "color del prefijo del apodo cuando es un usuario del canal"
+msgid "color for nick prefix (prefix is custom string displayed before nick)"
+msgstr ""
+
+msgid "color for nick suffix (suffix is custom string displayed after nick)"
+msgstr ""
+
msgid "color for text \"Notice\" in notices"
msgstr "color para el texto \"Notice\" en los mensajes de aviso"
diff --git a/po/fr.po b/po/fr.po
index e7b1d1fa6..03389b9d4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-12 12:58+0200\n"
-"PO-Revision-Date: 2010-10-12 12:58+0200\n"
+"POT-Creation-Date: 2010-10-13 08:38+0200\n"
+"PO-Revision-Date: 2010-10-13 08:39+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -4818,6 +4818,16 @@ 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 nick prefix (prefix is custom string displayed before nick)"
+msgstr ""
+"couleur pour le préfixe du pseudo (le préfixe est une chaîne personnalisée "
+"affichée avant le pseudo)"
+
+msgid "color for nick suffix (suffix is custom string displayed after nick)"
+msgstr ""
+"couleur pour le suffixe du pseudo (le suffixe est une chaîne personnalisée "
+"affichée après le pseudo)"
+
msgid "color for text \"Notice\" in notices"
msgstr "couleur pour le texte \"Notice\" dans les notices"
diff --git a/po/hu.po b/po/hu.po
index d521ed6da..4b2e4c0a9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-12 12:58+0200\n"
+"POT-Creation-Date: 2010-10-13 08:38+0200\n"
"PO-Revision-Date: 2010-08-07 10:46+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4467,6 +4467,12 @@ msgstr ""
msgid "color for prefix of nick which is user on channel"
msgstr ""
+msgid "color for nick prefix (prefix is custom string displayed before nick)"
+msgstr ""
+
+msgid "color for nick suffix (suffix is custom string displayed after nick)"
+msgstr ""
+
#, fuzzy
msgid "color for text \"Notice\" in notices"
msgstr "új üzenetet tartalmazó ablak színe"
diff --git a/po/it.po b/po/it.po
index 228918059..b8c74f898 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-12 12:58+0200\n"
+"POT-Creation-Date: 2010-10-13 08:38+0200\n"
"PO-Revision-Date: 2010-10-10 19:30+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4778,6 +4778,12 @@ msgstr "colore per il prefisso del nick che ha il voice sul canale"
msgid "color for prefix of nick which is user on channel"
msgstr "colore per il prefisso del nick che è utente sul canale"
+msgid "color for nick prefix (prefix is custom string displayed before nick)"
+msgstr ""
+
+msgid "color for nick suffix (suffix is custom string displayed after nick)"
+msgstr ""
+
msgid "color for text \"Notice\" in notices"
msgstr "colore per il testo \"Notifica\" nelle notifiche"
diff --git a/po/pl.po b/po/pl.po
index e97347bef..45a97fb63 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-12 12:58+0200\n"
+"POT-Creation-Date: 2010-10-13 08:38+0200\n"
"PO-Revision-Date: 2010-08-07 10:46+0200\n"
"Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4738,6 +4738,12 @@ msgstr "kolor prefiksu nicka posiadającego voice"
msgid "color for prefix of nick which is user on channel"
msgstr "kolor prefixu nicka użytkownika na kanale"
+msgid "color for nick prefix (prefix is custom string displayed before nick)"
+msgstr ""
+
+msgid "color for nick suffix (suffix is custom string displayed after nick)"
+msgstr ""
+
msgid "color for text \"Notice\" in notices"
msgstr "kolor tekstu \"Notice\" w podświetleniach"
diff --git a/po/ru.po b/po/ru.po
index 172f76451..1c17e2df6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.3.4-dev\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2010-10-12 12:58+0200\n"
+"POT-Creation-Date: 2010-10-13 08:38+0200\n"
"PO-Revision-Date: 2010-08-07 10:46+0200\n"
"Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4474,6 +4474,12 @@ msgstr ""
msgid "color for prefix of nick which is user on channel"
msgstr ""
+msgid "color for nick prefix (prefix is custom string displayed before nick)"
+msgstr ""
+
+msgid "color for nick suffix (suffix is custom string displayed after nick)"
+msgstr ""
+
#, fuzzy
msgid "color for text \"Notice\" in notices"
msgstr "цвет текущего окна с сообщениями"
diff --git a/po/weechat.pot b/po/weechat.pot
index 01da54531..07aa80fdc 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-10-12 12:58+0200\n"
+"POT-Creation-Date: 2010-10-13 08:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3823,6 +3823,12 @@ msgstr ""
msgid "color for prefix of nick which is user on channel"
msgstr ""
+msgid "color for nick prefix (prefix is custom string displayed before nick)"
+msgstr ""
+
+msgid "color for nick suffix (suffix is custom string displayed after nick)"
+msgstr ""
+
msgid "color for text \"Notice\" in notices"
msgstr ""
diff --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h
index 0031a97e0..4b6588f57 100644
--- a/src/plugins/irc/irc-color.h
+++ b/src/plugins/irc/irc-color.h
@@ -70,6 +70,8 @@
#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_NICK_PREFIX weechat_color(weechat_config_string(irc_config_color_nick_prefix))
+#define IRC_COLOR_NICK_SUFFIX weechat_color(weechat_config_string(irc_config_color_nick_suffix))
#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 f5122d908..c7a48cc97 100644
--- a/src/plugins/irc/irc-config.c
+++ b/src/plugins/irc/irc-config.c
@@ -94,6 +94,8 @@ 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_nick_prefix;
+struct t_config_option *irc_config_color_nick_suffix;
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;
@@ -1879,6 +1881,20 @@ irc_config_init ()
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_nick_prefix = weechat_config_new_option (
+ irc_config_file, ptr_section,
+ "nick_prefix", "color",
+ N_("color for nick prefix (prefix is custom string displayed "
+ "before nick)"),
+ NULL, -1, 0, "green", NULL, 0, NULL, NULL,
+ NULL, NULL, NULL, NULL);
+ irc_config_color_nick_suffix = weechat_config_new_option (
+ irc_config_file, ptr_section,
+ "nick_suffix", "color",
+ N_("color for nick suffix (suffix is custom string displayed "
+ "after nick)"),
+ NULL, -1, 0, "green", NULL, 0, NULL, NULL,
+ NULL, 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 89310215c..9a85862ce 100644
--- a/src/plugins/irc/irc-config.h
+++ b/src/plugins/irc/irc-config.h
@@ -118,6 +118,8 @@ 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_nick_prefix;
+extern struct t_config_option *irc_config_color_nick_suffix;
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 7666a4ff9..b88b986ef 100644
--- a/src/plugins/irc/irc-nick.c
+++ b/src/plugins/irc/irc-nick.c
@@ -698,7 +698,7 @@ irc_nick_as_prefix (struct t_irc_server *server, struct t_irc_nick *nick,
snprintf (result, sizeof (result), "%s%s%s%s%s%s%s%s\t",
(weechat_config_string (irc_config_look_nick_prefix)
&& weechat_config_string (irc_config_look_nick_prefix)[0]) ?
- IRC_COLOR_CHAT_DELIMITERS : "",
+ IRC_COLOR_NICK_PREFIX : "",
(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) : "",
@@ -708,7 +708,7 @@ irc_nick_as_prefix (struct t_irc_server *server, struct t_irc_nick *nick,
(nick) ? nick->name : nickname,
(weechat_config_string (irc_config_look_nick_suffix)
&& weechat_config_string (irc_config_look_nick_suffix)[0]) ?
- IRC_COLOR_CHAT_DELIMITERS : "",
+ IRC_COLOR_NICK_SUFFIX : "",
(weechat_config_string (irc_config_look_nick_suffix)
&& weechat_config_string (irc_config_look_nick_suffix)[0]) ?
weechat_config_string (irc_config_look_nick_suffix) : "");
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:43:36 +0000