From 9c5116b4fec232c92b199b53e7b829657413f4fd Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sat, 9 Jun 2012 21:33:10 +0200 Subject: [PATCH] core: add options weechat.color.chat_nick_offline_highlight(_bg) (text/bg for highlight when nick is offline) --- ChangeLog | 4 ++-- doc/de/autogen/user/weechat_options.txt | 12 +++++++++++- doc/en/autogen/user/weechat_options.txt | 12 +++++++++++- doc/en/weechat_dev.en.txt | 1 + doc/fr/autogen/user/weechat_options.txt | 12 +++++++++++- doc/it/autogen/user/weechat_options.txt | 12 +++++++++++- po/cs.po | 12 ++++++++++-- po/de.po | 12 ++++++++++-- po/es.po | 12 ++++++++++-- po/fr.po | 16 +++++++++++----- po/hu.po | 15 ++++++++++++--- po/it.po | 12 ++++++++++-- po/ja.po | 12 ++++++++++-- po/pl.po | 12 ++++++++++-- po/pt_BR.po | 15 ++++++++++++--- po/ru.po | 15 ++++++++++++--- po/weechat.pot | 10 ++++++++-- src/core/wee-config.c | 16 +++++++++++++++- src/core/wee-config.h | 2 ++ src/gui/curses/gui-curses-chat.c | 8 ++++++-- src/gui/curses/gui-curses-color.c | 1 + src/gui/gui-color.h | 1 + 22 files changed, 187 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4285213f6..ca52e26c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,8 +8,8 @@ Version 0.3.9 (under dev!) -------------------------- * core: add options weechat.look.color_nick_offline and - weechat.color.chat_nick_offline to use different color for offline nicks in - prefix (task #11109) + weechat.color.chat_nick_offline{_highlight|_highlight_bg} to use different + color for offline nicks in prefix (task #11109) * core: reallow names beginning with "#" for bars, proxies and filters * core: escape special chars (`#[\`) in configuration files for name of options (bug #36584) diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt index 75ed19303..f00f494a6 100644 --- a/doc/de/autogen/user/weechat_options.txt +++ b/doc/de/autogen/user/weechat_options.txt @@ -68,6 +68,16 @@ ** 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 können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `darkgray`) +* [[option_weechat.color.chat_nick_offline_highlight]] *weechat.color.chat_nick_offline_highlight* +** Beschreibung: `text color for offline nick with highlight` +** 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 können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `default`) + +* [[option_weechat.color.chat_nick_offline_highlight_bg]] *weechat.color.chat_nick_offline_highlight_bg* +** Beschreibung: `background color for offline nick with highlight` +** 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 können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "_" für unterstrichen (Standardwert: `darkgray`) + * [[option_weechat.color.chat_nick_other]] *weechat.color.chat_nick_other* ** Beschreibung: `Farbe des anderen Nicknamens in einem privaten Buffer` ** Typ: Farbe @@ -419,7 +429,7 @@ ** Werte: on, off (Standardwert: `off`) * [[option_weechat.look.color_nick_offline]] *weechat.look.color_nick_offline* -** Beschreibung: `use a different color for offline nick (not in nicklist any more)` +** Beschreibung: `use a different color for offline nicks (not in nicklist any more)` ** Typ: boolesch ** Werte: on, off (Standardwert: `off`) diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt index 48c880c7c..65936eb83 100644 --- a/doc/en/autogen/user/weechat_options.txt +++ b/doc/en/autogen/user/weechat_options.txt @@ -68,6 +68,16 @@ ** 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: `darkgray`) +* [[option_weechat.color.chat_nick_offline_highlight]] *weechat.color.chat_nick_offline_highlight* +** description: `text color for offline nick with highlight` +** 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`) + +* [[option_weechat.color.chat_nick_offline_highlight_bg]] *weechat.color.chat_nick_offline_highlight_bg* +** description: `background color for offline nick with highlight` +** 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: `darkgray`) + * [[option_weechat.color.chat_nick_other]] *weechat.color.chat_nick_other* ** description: `text color for other nick in private buffer` ** type: color @@ -419,7 +429,7 @@ ** values: on, off (default value: `off`) * [[option_weechat.look.color_nick_offline]] *weechat.look.color_nick_offline* -** description: `use a different color for offline nick (not in nicklist any more)` +** description: `use a different color for offline nicks (not in nicklist any more)` ** type: boolean ** values: on, off (default value: `off`) diff --git a/doc/en/weechat_dev.en.txt b/doc/en/weechat_dev.en.txt index 8f86c879c..91fb538ee 100644 --- a/doc/en/weechat_dev.en.txt +++ b/doc/en/weechat_dev.en.txt @@ -832,6 +832,7 @@ Color codes using options (see 't_gui_color_enum', in file 'src/gui/gui-color.h' | 36 | weechat.color.chat_inactive_buffer _(new in version 0.3.6)_ | 37 | weechat.color.chat_prefix_buffer_inactive_buffer _(new in version 0.3.6)_ | 38 | weechat.color.chat_nick_offline _(new in version 0.3.9)_ +| 39 | weechat.color.chat_nick_offline_highlight _(new in version 0.3.9)_ |======================================== WeeChat colors are: diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt index 8bb39ee7d..46f847eb0 100644 --- a/doc/fr/autogen/user/weechat_options.txt +++ b/doc/fr/autogen/user/weechat_options.txt @@ -64,7 +64,17 @@ ** valeurs: toute chaîne (valeur par défaut: `"cyan,magenta,green,brown,lightblue,default,lightcyan,lightmagenta,lightgreen,blue"`) * [[option_weechat.color.chat_nick_offline]] *weechat.color.chat_nick_offline* -** description: `couleur du texte pour les pseudos déconnectés (qui ne sont plus dans la liste de pseudos)` +** description: `couleur du texte pour un pseudo déconnecté (qui n'est plus dans la liste de pseudos)` +** 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: `darkgray`) + +* [[option_weechat.color.chat_nick_offline_highlight]] *weechat.color.chat_nick_offline_highlight* +** description: `couleur du texte pour un pseudo déconnecté avec highlight` +** 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`) + +* [[option_weechat.color.chat_nick_offline_highlight_bg]] *weechat.color.chat_nick_offline_highlight_bg* +** description: `couleur du fond pour un pseudo déconnecté avec highlight` ** 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: `darkgray`) diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt index edaa16d45..dc63be3b7 100644 --- a/doc/it/autogen/user/weechat_options.txt +++ b/doc/it/autogen/user/weechat_options.txt @@ -68,6 +68,16 @@ ** tipo: colore ** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `darkgray`) +* [[option_weechat.color.chat_nick_offline_highlight]] *weechat.color.chat_nick_offline_highlight* +** descrizione: `text color for offline nick with highlight` +** tipo: colore +** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `default`) + +* [[option_weechat.color.chat_nick_offline_highlight_bg]] *weechat.color.chat_nick_offline_highlight_bg* +** descrizione: `background color for offline nick with highlight` +** tipo: colore +** valori: un nome colore di WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numero colore del terminale o un alias; attributi consentiti prima del colore (solo per il colore del testo, non lo sfondo): "*" per il grassetto, "!" per l'inverso, "_" per la sottolineatura (valore predefinito: `darkgray`) + * [[option_weechat.color.chat_nick_other]] *weechat.color.chat_nick_other* ** descrizione: `colore del testo per gli altri nick nel buffer privato` ** tipo: colore @@ -419,7 +429,7 @@ ** valori: on, off (valore predefinito: `off`) * [[option_weechat.look.color_nick_offline]] *weechat.look.color_nick_offline* -** descrizione: `use a different color for offline nick (not in nicklist any more)` +** descrizione: `use a different color for offline nicks (not in nicklist any more)` ** tipo: bool ** valori: on, off (valore predefinito: `off`) diff --git a/po/cs.po b/po/cs.po index ec87e569b..1241d54e2 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-08 22:05+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -2302,7 +2302,7 @@ msgid "" msgstr "" #, fuzzy -msgid "use a different color for offline nick (not in nicklist any more)" +msgid "use a different color for offline nicks (not in nicklist any more)" msgstr "" "barva textu pro jméno bufferu (před prefixem, při spojení vice bufferů se " "stejným číslem)" @@ -2750,6 +2750,14 @@ msgstr "barva textu pro lokální přezdívku v okně rozhovoru" msgid "text color for offline nick (not in nicklist any more)" msgstr "barva textu pro nepřipojené přezdíveky" +#, fuzzy +msgid "text color for offline nick with highlight" +msgstr "barva textu pro nepřipojené přezdíveky" + +#, fuzzy +msgid "background color for offline nick with highlight" +msgstr "barva pozadí pro zvýrazněný prefix" + msgid "text color for other nick in private buffer" msgstr "barva textu pro jiné přezdívky v soukromém bufferu" diff --git a/po/de.po b/po/de.po index b11c7f2ac..860c06d42 100644 --- a/po/de.po +++ b/po/de.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-08 22:05+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -2522,7 +2522,7 @@ msgstr "" "Buffers nicht die aktiv Zeile ist)" #, fuzzy -msgid "use a different color for offline nick (not in nicklist any more)" +msgid "use a different color for offline nicks (not in nicklist any more)" msgstr "" "Textfarbe für Zeilen in einem inaktiven Fenster (betrifft das Fenster, " "welches nicht aktiv ist)" @@ -3040,6 +3040,14 @@ msgstr "Textfarbe für den eigenen Nicknamen, im lokalen Chat-Fenster." msgid "text color for offline nick (not in nicklist any more)" msgstr "Textfarbe von Nicknamen die Offline sind" +#, fuzzy +msgid "text color for offline nick with highlight" +msgstr "Textfarbe von Nicknamen die Offline sind" + +#, fuzzy +msgid "background color for offline nick with highlight" +msgstr "Hintergrundfarbe für Highlight-Präfix" + msgid "text color for other nick in private buffer" msgstr "Farbe des anderen Nicknamens in einem privaten Buffer" diff --git a/po/es.po b/po/es.po index 0b58860eb..cf0353202 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-08 22:05+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -2431,7 +2431,7 @@ msgstr "" "ventana actual, o si la línea de un buffer fusionado no está seleccionado)" #, fuzzy -msgid "use a different color for offline nick (not in nicklist any more)" +msgid "use a different color for offline nicks (not in nicklist any more)" msgstr "" "usar un diferente color para líneas en ventanas inactivas (cuando la ventana " "no es la ventana actual)" @@ -2918,6 +2918,14 @@ msgstr "color para el apodo propio en la ventana de conversación" msgid "text color for offline nick (not in nicklist any more)" msgstr "color para apodos desconectados" +#, fuzzy +msgid "text color for offline nick with highlight" +msgstr "color para apodos desconectados" + +#, fuzzy +msgid "background color for offline nick with highlight" +msgstr "color de fondo para el prefijo con realce" + msgid "text color for other nick in private buffer" msgstr "color para el otro apodo en una conversación privada" diff --git a/po/fr.po b/po/fr.po index b648eb840..9ae11514f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-08 22:05+0200\n" -"PO-Revision-Date: 2012-06-08 14:46+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" +"PO-Revision-Date: 2012-06-09 13:19+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -2438,7 +2438,7 @@ msgstr "" "n'est pas la fenêtre courante, ou si la ligne est d'un tampon mélangé et le " "tampon n'est pas sélectionné)" -msgid "use a different color for offline nick (not in nicklist any more)" +msgid "use a different color for offline nicks (not in nicklist any more)" msgstr "" "utiliser une couleur différente pour les pseudos déconnectés (qui ne sont " "plus dans la liste de pseudos)" @@ -2929,8 +2929,14 @@ msgstr "couleur du texte pour le pseudo local dans la fenêtre de discussion" msgid "text color for offline nick (not in nicklist any more)" msgstr "" -"couleur du texte pour les pseudos déconnectés (qui ne sont plus dans la " -"liste de pseudos)" +"couleur du texte pour un pseudo déconnecté (qui n'est plus dans la liste de " +"pseudos)" + +msgid "text color for offline nick with highlight" +msgstr "couleur du texte pour un pseudo déconnecté avec highlight" + +msgid "background color for offline nick with highlight" +msgstr "couleur du fond pour un pseudo déconnecté avec highlight" msgid "text color for other nick in private buffer" msgstr "couleur du texte pour l'autre pseudo dans le tampon privée" diff --git a/po/hu.po b/po/hu.po index 1268ba8d0..e0fa38a35 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-08 22:05+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1982,8 +1982,9 @@ msgid "" "window, or if line is from a merged buffer not selected)" msgstr "" -msgid "use a different color for offline nick (not in nicklist any more)" -msgstr "" +#, fuzzy +msgid "use a different color for offline nicks (not in nicklist any more)" +msgstr "távollevő felhasználók nevének színe" msgid "" "automatically reset table of color pairs when number of available pairs is " @@ -2389,6 +2390,14 @@ msgstr "a név előtt megjelenítendő szöveg a beszédablakban" msgid "text color for offline nick (not in nicklist any more)" msgstr "távollevő felhasználók nevének színe" +#, fuzzy +msgid "text color for offline nick with highlight" +msgstr "távollevő felhasználók nevének színe" + +#, fuzzy +msgid "background color for offline nick with highlight" +msgstr "címsor háttere" + #, fuzzy msgid "text color for other nick in private buffer" msgstr "másik fél nevének színe privát beszélgetésben" diff --git a/po/it.po b/po/it.po index 97f68b692..7390dc5d1 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-08 22:05+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -2422,7 +2422,7 @@ msgstr "" "quella corrente, o se la riga viene da un buffer unito non selezionato)" #, fuzzy -msgid "use a different color for offline nick (not in nicklist any more)" +msgid "use a different color for offline nicks (not in nicklist any more)" msgstr "" "usa un colore diverso per le righe nella finestra inattiva (quando la " "finestra non è quella corrente)" @@ -2908,6 +2908,14 @@ msgstr "colore del testo per il nick locale nella finestra di chat" msgid "text color for offline nick (not in nicklist any more)" msgstr "colore del testo per i nick non in linea" +#, fuzzy +msgid "text color for offline nick with highlight" +msgstr "colore del testo per i nick non in linea" + +#, fuzzy +msgid "background color for offline nick with highlight" +msgstr "colore di sfondo per il prefisso di evento" + msgid "text color for other nick in private buffer" msgstr "colore del testo per gli altri nick nel buffer privato" diff --git a/po/ja.po b/po/ja.po index 6ac3181ef..7490a829b 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-08 22:05+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -2385,7 +2385,7 @@ msgstr "" "行が未選択のマージバッファからの場合)" #, fuzzy -msgid "use a different color for offline nick (not in nicklist any more)" +msgid "use a different color for offline nicks (not in nicklist any more)" msgstr "" "アクティブでないウィンドウでは行に異なる色を使用 (ウィンドウにフォーカスが無" "い場合)" @@ -2841,6 +2841,14 @@ msgstr "チャットウィンドウ内のローカルニックネームのテキ msgid "text color for offline nick (not in nicklist any more)" msgstr "オフラインのニックネームのテキスト色" +#, fuzzy +msgid "text color for offline nick with highlight" +msgstr "オフラインのニックネームのテキスト色" + +#, fuzzy +msgid "background color for offline nick with highlight" +msgstr "ハイライトされたプレフィックスの背景色" + msgid "text color for other nick in private buffer" msgstr "プライベートバッファ内の他のニックネームのテキスト色" diff --git a/po/pl.po b/po/pl.po index 4a9a31eb7..2c32a72e4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-08 22:05+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -2433,7 +2433,7 @@ msgstr "" "buforów)" #, fuzzy -msgid "use a different color for offline nick (not in nicklist any more)" +msgid "use a different color for offline nicks (not in nicklist any more)" msgstr "" "użycie rożnych kolorów dla linii w nieaktywnym oknie (kiedy okno nie jest " "obecnym oknem)" @@ -2912,6 +2912,14 @@ msgstr "kolor lokalnego nicka w oknie rozmowy" msgid "text color for offline nick (not in nicklist any more)" msgstr "kolor dla nieobecnych nicków" +#, fuzzy +msgid "text color for offline nick with highlight" +msgstr "kolor dla nieobecnych nicków" + +#, fuzzy +msgid "background color for offline nick with highlight" +msgstr "kolor tła przedrostka podświetlenia" + msgid "text color for other nick in private buffer" msgstr "kolor innego nicka w prywatnym buforze" diff --git a/po/pt_BR.po b/po/pt_BR.po index d681ea361..7cefb2977 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-08 22:05+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -2370,8 +2370,9 @@ msgid "" "window, or if line is from a merged buffer not selected)" msgstr "" -msgid "use a different color for offline nick (not in nicklist any more)" -msgstr "" +#, fuzzy +msgid "use a different color for offline nicks (not in nicklist any more)" +msgstr "cor de texto para apelidos desconectados" msgid "" "automatically reset table of color pairs when number of available pairs is " @@ -2831,6 +2832,14 @@ msgstr "cor de texto para apelido local na janela de conversa" msgid "text color for offline nick (not in nicklist any more)" msgstr "cor de texto para apelidos desconectados" +#, fuzzy +msgid "text color for offline nick with highlight" +msgstr "cor de texto para apelidos desconectados" + +#, fuzzy +msgid "background color for offline nick with highlight" +msgstr "cor de fundo para prefixo de destacado" + msgid "text color for other nick in private buffer" msgstr "cor de texto para outros apelidos em buffers privados" diff --git a/po/ru.po b/po/ru.po index 1c82a380d..04a623e95 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.9-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-06-08 22:05+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" "PO-Revision-Date: 2012-06-03 09:49+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -2001,8 +2001,9 @@ msgid "" "window, or if line is from a merged buffer not selected)" msgstr "" -msgid "use a different color for offline nick (not in nicklist any more)" -msgstr "" +#, fuzzy +msgid "use a different color for offline nicks (not in nicklist any more)" +msgstr "цвет отошедших ников" msgid "" "automatically reset table of color pairs when number of available pairs is " @@ -2417,6 +2418,14 @@ msgstr "текст, который отображать до ника в окн msgid "text color for offline nick (not in nicklist any more)" msgstr "цвет отошедших ников" +#, fuzzy +msgid "text color for offline nick with highlight" +msgstr "цвет отошедших ников" + +#, fuzzy +msgid "background color for offline nick with highlight" +msgstr "цвет фона заголовка" + #, fuzzy msgid "text color for other nick in private buffer" msgstr "цвет ника собеседника в окне привата" diff --git a/po/weechat.pot b/po/weechat.pot index 97c857b96..eb6a315a8 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: 2012-06-08 22:05+0200\n" +"POT-Creation-Date: 2012-06-09 13:19+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1744,7 +1744,7 @@ msgid "" "window, or if line is from a merged buffer not selected)" msgstr "" -msgid "use a different color for offline nick (not in nicklist any more)" +msgid "use a different color for offline nicks (not in nicklist any more)" msgstr "" msgid "" @@ -2102,6 +2102,12 @@ msgstr "" msgid "text color for offline nick (not in nicklist any more)" msgstr "" +msgid "text color for offline nick with highlight" +msgstr "" + +msgid "background color for offline nick with highlight" +msgstr "" + msgid "text color for other nick in private buffer" msgstr "" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index b03d7f1ac..88762bece 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -176,6 +176,8 @@ struct t_config_option *config_color_chat_nick; struct t_config_option *config_color_chat_nick_colors; struct t_config_option *config_color_chat_nick_self; struct t_config_option *config_color_chat_nick_offline; +struct t_config_option *config_color_chat_nick_offline_highlight; +struct t_config_option *config_color_chat_nick_offline_highlight_bg; struct t_config_option *config_color_chat_nick_other; struct t_config_option *config_color_chat_host; struct t_config_option *config_color_chat_delimiters; @@ -1832,7 +1834,7 @@ config_weechat_init_options () config_look_color_nick_offline = config_file_new_option ( weechat_config_file, ptr_section, "color_nick_offline", "boolean", - N_("use a different color for offline nick (not in nicklist any more)"), + N_("use a different color for offline nicks (not in nicklist any more)"), NULL, 0, 0, "off", NULL, 0, NULL, NULL, &config_change_buffers, NULL, NULL, NULL); config_look_color_pairs_auto_reset = config_file_new_option ( weechat_config_file, ptr_section, @@ -2407,6 +2409,18 @@ config_weechat_init_options () N_("text color for offline nick (not in nicklist any more)"), NULL, GUI_COLOR_CHAT_NICK_OFFLINE, 0, "darkgray", NULL, 0, NULL, NULL, &config_change_color, NULL, NULL, NULL); + config_color_chat_nick_offline_highlight = config_file_new_option ( + weechat_config_file, ptr_section, + "chat_nick_offline_highlight", "color", + N_("text color for offline nick with highlight"), + NULL, -1, 0, "default", NULL, 0, + NULL, NULL, &config_change_color, NULL, NULL, NULL); + config_color_chat_nick_offline_highlight_bg = config_file_new_option ( + weechat_config_file, ptr_section, + "chat_nick_offline_highlight_bg", "color", + N_("background color for offline nick with highlight"), + NULL, -1, 0, "darkgray", NULL, 0, + NULL, NULL, &config_change_color, NULL, NULL, NULL); config_color_chat_nick_other = config_file_new_option ( weechat_config_file, ptr_section, "chat_nick_other", "color", diff --git a/src/core/wee-config.h b/src/core/wee-config.h index d9229146a..81da71db2 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -197,6 +197,8 @@ extern struct t_config_option *config_color_chat_nick; extern struct t_config_option *config_color_chat_nick_colors; extern struct t_config_option *config_color_chat_nick_self; extern struct t_config_option *config_color_chat_nick_offline; +extern struct t_config_option *config_color_chat_nick_offline_highlight; +extern struct t_config_option *config_color_chat_nick_offline_highlight_bg; extern struct t_config_option *config_color_chat_nick_other; extern struct t_config_option *config_color_chat_host; extern struct t_config_option *config_color_chat_delimiters; diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c index 5e6ef267f..a44a61479 100644 --- a/src/gui/curses/gui-curses-chat.c +++ b/src/gui/curses/gui-curses-chat.c @@ -124,10 +124,14 @@ gui_chat_reset_style (struct t_gui_window *window, struct t_gui_line *line, { color = color_inactive_buffer; } - else if (nick_offline) + else if (nick_offline == 1) { color = GUI_COLOR_CHAT_NICK_OFFLINE; } + else if (nick_offline > 1) + { + color = GUI_COLOR_CHAT_NICK_OFFLINE_HIGHLIGHT; + } if (reset_attributes) gui_window_reset_style (GUI_WINDOW_OBJECTS(window)->win_chat, color); @@ -854,7 +858,7 @@ gui_chat_display_time_to_prefix (struct t_gui_window *window, } if (!simulate) { - gui_chat_reset_style (window, line, nick_offline, 1, + gui_chat_reset_style (window, line, (nick_offline) ? 2 : 0, 1, GUI_COLOR_CHAT_INACTIVE_WINDOW, (CONFIG_BOOLEAN(config_look_color_inactive_buffer) && CONFIG_BOOLEAN(config_look_color_inactive_prefix) diff --git a/src/gui/curses/gui-curses-color.c b/src/gui/curses/gui-curses-color.c index 853bf508e..e3fffcf31 100644 --- a/src/gui/curses/gui-curses-color.c +++ b/src/gui/curses/gui-curses-color.c @@ -1417,6 +1417,7 @@ gui_color_init_weechat () gui_color_build (GUI_COLOR_CHAT_INACTIVE_BUFFER, CONFIG_COLOR(config_color_chat_inactive_buffer), CONFIG_COLOR(config_color_chat_bg)); gui_color_build (GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_BUFFER, CONFIG_COLOR(config_color_chat_prefix_buffer_inactive_buffer), CONFIG_COLOR(config_color_chat_bg)); gui_color_build (GUI_COLOR_CHAT_NICK_OFFLINE, CONFIG_COLOR(config_color_chat_nick_offline), CONFIG_COLOR(config_color_chat_bg)); + gui_color_build (GUI_COLOR_CHAT_NICK_OFFLINE_HIGHLIGHT, CONFIG_COLOR(config_color_chat_nick_offline_highlight), CONFIG_COLOR(config_color_chat_nick_offline_highlight_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 59c8ebc74..14dbed157 100644 --- a/src/gui/gui-color.h +++ b/src/gui/gui-color.h @@ -75,6 +75,7 @@ enum t_gui_color_enum GUI_COLOR_CHAT_INACTIVE_BUFFER, GUI_COLOR_CHAT_PREFIX_BUFFER_INACTIVE_BUFFER, GUI_COLOR_CHAT_NICK_OFFLINE, + GUI_COLOR_CHAT_NICK_OFFLINE_HIGHLIGHT, /* number of colors */ GUI_COLOR_NUM_COLORS,